Skip to content

Commit 8abd117

Browse files
authored
feat!: relax ProviderBuilder bounds (#2276)
Allows: - calling the filler helper methods at any point of the builder - using on_anvil* with any network
1 parent 47231f1 commit 8abd117

File tree

7 files changed

+149
-175
lines changed

7 files changed

+149
-175
lines changed

crates/contract/src/multicall.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,7 @@ mod tests {
126126

127127
let err = multicall.aggregate3().await.unwrap_err();
128128

129-
assert!(
130-
err.to_string().contains("execution reverted: Multicall3: call failed"),
131-
"{:?}",
132-
err
133-
);
129+
assert!(err.to_string().contains("Multicall3: call failed"), "{err}");
134130

135131
let failing_call = CallItemBuilder::new(dummy.fail()).allow_failure(true);
136132
let multicall = provider

crates/node-bindings/src/nodes/anvil.rs

+7-15
Original file line numberDiff line numberDiff line change
@@ -416,21 +416,13 @@ impl Anvil {
416416
}
417417

418418
if !private_keys.is_empty() {
419-
let (default, remaining) = private_keys.split_first().unwrap();
420-
let pks = remaining
421-
.iter()
422-
.map(|key| {
423-
let mut signer = LocalSigner::from(key.clone());
424-
signer.set_chain_id(chain_id);
425-
signer
426-
})
427-
.collect::<Vec<_>>();
428-
429-
let mut default_signer = LocalSigner::from(default.clone());
430-
default_signer.set_chain_id(chain_id);
431-
let mut w = EthereumWallet::new(default_signer);
432-
433-
for pk in pks {
419+
let mut private_keys = private_keys.iter().map(|key| {
420+
let mut signer = LocalSigner::from(key.clone());
421+
signer.set_chain_id(chain_id);
422+
signer
423+
});
424+
let mut w = EthereumWallet::new(private_keys.next().unwrap());
425+
for pk in private_keys {
434426
w.register_signer(pk);
435427
}
436428
wallet = Some(w);

0 commit comments

Comments
 (0)