Fix clippy warnings

Sovereign-Labs · Jun 20, 2023 · f6e514e · f6e514e
1 parent d1b095b
commit f6e514e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git 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<Value = BatchReceipt<u32, u32>> {
-    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::<BatchReceipt<u32, u32>>(args)
 }

diff --git 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
@@ -18,7 +18,7 @@ pub trait FuzzHasher {
 
 /// The default hasher to use for fuzzing
 fn default_fuzz_hasher() -> Box<dyn FuzzHasher> {
-    Box::new(sha2::Sha256::new())
+    Box::new(::sha2::Sha256::new())
 }
 
 impl<T: SimpleHasher + Clone> FuzzHasher for T {
@@ -32,7 +32,7 @@ impl<T: SimpleHasher + Clone> 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<dyn FuzzHasher>,
+    hasher: &'a dyn FuzzHasher,
 }
 
 impl<'a> MerkleHasher for FuzzMerkleHasher<'a> {