diff --git a/examples/demo-rollup/src/test_rpc.rs b/examples/demo-rollup/src/test_rpc.rs index c3f4dd719e..8f77a437e6 100644 --- a/examples/demo-rollup/src/test_rpc.rs +++ b/examples/demo-rollup/src/test_rpc.rs @@ -248,8 +248,10 @@ fn test_get_events() { } fn batch_receipt_without_hasher() -> impl Strategy> { - let mut args: BatchReceiptStrategyArgs = Default::default(); - args.hasher = None; + let mut args = BatchReceiptStrategyArgs { + hasher: None, + ..Default::default() + }; args.transaction_strategy_args.hasher = None; any_with::>(args) } diff --git a/rollup-interface/src/state_machine/crypto/simple_merkle.rs b/rollup-interface/src/state_machine/crypto/simple_merkle.rs index fa7fbb06a6..60e8abbc96 100644 --- a/rollup-interface/src/state_machine/crypto/simple_merkle.rs +++ b/rollup-interface/src/state_machine/crypto/simple_merkle.rs @@ -33,21 +33,21 @@ pub trait MerkleHasher { /// domain-separated RC6962-style merkle trees. macro_rules! impl_merkle_hasher( ($name:ty) => { - impl crate::crypto::simple_merkle::MerkleHasher for $name { + impl $crate::crypto::simple_merkle::MerkleHasher for $name { fn empty_root(&mut self) -> [u8; 32] { <$name as SimpleHasher>::new().finalize() } fn leaf_hash(&mut self, bytes: impl AsRef<[u8]>) -> [u8; 32] { let mut hasher = <$name as SimpleHasher>::new(); - hasher.update(&crate::crypto::simple_merkle::DEFAULT_LEAF_DOMAIN_SEPARATOR); + hasher.update(& $crate::crypto::simple_merkle::DEFAULT_LEAF_DOMAIN_SEPARATOR); hasher.update(bytes.as_ref()); hasher.finalize() } fn inner_hash(&mut self, left: &[u8; 32], right: &[u8; 32]) -> [u8; 32] { let mut hasher = <$name as SimpleHasher>::new(); - hasher.update(&crate::crypto::simple_merkle::DEFAULT_INTERNAL_DOMAIN_SEPARATOR); + hasher.update(& $crate::crypto::simple_merkle::DEFAULT_INTERNAL_DOMAIN_SEPARATOR); hasher.update(left); hasher.update(right); hasher.finalize() diff --git a/rollup-interface/src/state_machine/stf/fuzzing.rs b/rollup-interface/src/state_machine/stf/fuzzing.rs index 1c9463777f..8d596a2186 100644 --- a/rollup-interface/src/state_machine/stf/fuzzing.rs +++ b/rollup-interface/src/state_machine/stf/fuzzing.rs @@ -18,7 +18,7 @@ pub trait FuzzHasher { /// The default hasher to use for fuzzing fn default_fuzz_hasher() -> Box { - Box::new(sha2::Sha256::new()) + Box::new(::sha2::Sha256::new()) } impl FuzzHasher for T { @@ -32,7 +32,7 @@ impl FuzzHasher for T { /// A special merkle hasher used only for fuzz tests. This hasher sacrifices some /// efficiency for object safety. struct FuzzMerkleHasher<'a> { - hasher: &'a Box, + hasher: &'a dyn FuzzHasher, } impl<'a> MerkleHasher for FuzzMerkleHasher<'a> {