Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[do not merge] Experimenting with static strategy #789

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f1c871c
add strategy objects
nbaztec Dec 12, 2024
b38109d
remove unused parts
nbaztec Dec 12, 2024
57f32f2
fix test build
nbaztec Dec 12, 2024
06aedf4
remove use_zk completely, fix ExecutorStrategy trait
nbaztec Dec 13, 2024
5d77f8c
fix deadlock
nbaztec Dec 14, 2024
6c00749
clippy
nbaztec Dec 14, 2024
b5fd952
fix tests, startup bug
nbaztec Dec 15, 2024
9009698
switch to try_lock to prevent deadlocks
nbaztec Dec 15, 2024
bee659d
revert try_lock
nbaztec Dec 15, 2024
b5b7e5f
noop instead of panic on zksync methods for evm, clippy
nbaztec Dec 15, 2024
5ee99fc
fix warp and roll
nbaztec Dec 15, 2024
2151459
fix script
nbaztec Dec 15, 2024
e9fbf13
make call immutable
nbaztec Dec 15, 2024
7b23078
deep clone strategies on clone
nbaztec Dec 16, 2024
095903b
trigger ci
nbaztec Dec 16, 2024
da60354
revert unintended change
nbaztec Dec 16, 2024
f740454
Merge branch 'main' into nish-abstraction-strategy
nbaztec Dec 16, 2024
193f955
fix zk cheatcodes in evm context
nbaztec Dec 16, 2024
a506866
fix get_code, remove unintended sleep
nbaztec Dec 16, 2024
0e9c64f
fix script test, clippy
nbaztec Dec 16, 2024
589c8ba
Merge branch 'main' into nish-abstraction-strategy
nbaztec Dec 16, 2024
f0d0f9d
fix zk_env
nbaztec Dec 16, 2024
d80312f
guard zk provider
nbaztec Dec 16, 2024
bdba380
use blocking provider call
nbaztec Dec 16, 2024
53d5d9a
Merge branch 'main' into nish-abstraction-strategy
nbaztec Dec 16, 2024
1876c01
use Box instead of Arc<Mutex<T>>
nbaztec Dec 17, 2024
d92ad57
chore: snapshot
popzxc Dec 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix get_code, remove unintended sleep
  • Loading branch information
nbaztec committed Dec 16, 2024
commit a5068662e016cbe660d5f5c0d8446f51eca837d0
2 changes: 1 addition & 1 deletion crates/evm/core/src/backend/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ impl Clone for Backend {
forks: self.forks.clone(),
mem_db: self.mem_db.clone(),
fork_init_journaled_state: self.fork_init_journaled_state.clone(),
active_fork_ids: self.active_fork_ids.clone(),
active_fork_ids: self.active_fork_ids,
inner: self.inner.clone(),
fork_url_type: self.fork_url_type.clone(),
}
Expand Down
2 changes: 1 addition & 1 deletion crates/forge/tests/it/cheats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ async fn test_cheats_local_with_seed(test_data: &ForgeTestData) {
}

#[tokio::test(flavor = "multi_thread")]
async fn test_cheats_local_default_foo() {
async fn test_cheats_local_default() {
test_cheats_local(&TEST_DATA_DEFAULT).await
}

Expand Down
4 changes: 0 additions & 4 deletions crates/strategy/zksync/src/cheatcode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -410,10 +410,6 @@ impl CheatcodeInspectorStrategy for ZksyncCheatcodeInspectorStrategy {
}

fn get_artifact_code(&self, state: &Cheatcodes, path: &str, deployed: bool) -> Result {
if !self.using_zk_vm {
return self.evm.get_artifact_code(state, path, deployed);
}

Ok(get_artifact_code(
&self.dual_compiled_contracts,
self.using_zk_vm,
Expand Down
1 change: 0 additions & 1 deletion crates/test-utils/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -882,7 +882,6 @@ impl TestCommand {
pub fn assert(&mut self) -> OutputAssert {
let assert = OutputAssert::new(self.execute());

std::thread::sleep(std::time::Duration::new(60, 0));
if self.redact_output {
return assert.with_assert(test_assert());
};
Expand Down
Loading