Cleaned up warnings

leader/src/mpt.rs

@@ -206,19 +206,21 @@ pub fn apply_diffs(
  for (&k, &v) in &old.storage.clone().unwrap_or_default() {
  if !new.storage.clone().unwrap_or_default().contains_key(&k) {
  // dbg!(format!("Del {:?} {:?}", addr, k));
- trie.delete(tokk(k));
+ trie.delete(tokk(k)).unwrap();
  // println!("Done Del {:?} {:?}", addr, k);
  } else {
  let sanity = trie.get(tokk(k)).unwrap();
  let sanity = rlp::decode::<U256>(sanity).unwrap();
  assert_eq!(sanity, v.into_uint());
  let w = *new.storage.clone().unwrap_or_default().get(&k).unwrap();
- trie.insert(tokk(k), rlp::encode(&w.into_uint()).to_vec());
+ trie.insert(tokk(k), rlp::encode(&w.into_uint()).to_vec())
+ .unwrap();
  }
  }
  for (&k, v) in &new.storage.clone().unwrap_or_default() {
  if !old.storage.clone().unwrap_or_default().contains_key(&k) {
- trie.insert(tokk(k), rlp::encode(&v.into_uint()).to_vec());
+ trie.insert(tokk(k), rlp::encode(&v.into_uint()).to_vec())
+ .unwrap();
  }
  }
  storage.insert(key, trie);
@@ -230,7 +232,8 @@ pub fn apply_diffs(
  if !diff.pre.contains_key(addr) {
  let mut trie = HashedPartialTrie::from(Node::Empty);
  for (&k, v) in &new.storage.clone().unwrap_or_default() {
- trie.insert(tokk(k), rlp::encode(&v.into_uint()).to_vec());
+ trie.insert(tokk(k), rlp::encode(&v.into_uint()).to_vec())
+ .unwrap();
  }
  storage.insert(key, trie);
  }
@@ -241,7 +244,7 @@ pub fn apply_diffs(
  // Delete accounts that are not in the post state.
  for addr in diff.pre.keys() {
  if !diff.post.contains_key(addr) {
- mpt.delete(tok(addr));
+ mpt.delete(tok(addr)).unwrap();
  }
  }
 
@@ -272,7 +275,8 @@ pub fn apply_diffs(
  .hash(),
  code_hash,
  };
- mpt.insert(tok(addr), rlp::encode(&account).to_vec());
+ mpt.insert(tok(addr), rlp::encode(&account).to_vec())
+ .unwrap();
  } else {
  let old = mpt
  .get(tok(addr))
@@ -307,7 +311,8 @@ pub fn apply_diffs(
  .unwrap_or(old.storage_root),
  code_hash,
  };
- mpt.insert(tok(addr), rlp::encode(&account).to_vec());
+ mpt.insert(tok(addr), rlp::encode(&account).to_vec())
+ .unwrap();
  }
  }
 

leader/src/rpc.rs

@@ -1,5 +1,5 @@
 use anyhow::Context;
-use ethers::types::{Address, Bloom, H256, U256};
+use ethers::types::{Address, H256, U256};
 use evm_arithmetization::proof::BlockHashes;
 use futures::{stream::FuturesOrdered, TryStreamExt};
 use reqwest::IntoUrl;
@@ -9,22 +9,9 @@ use tracing::info;
 #[derive(Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 struct EthGetBlockByNumberResult {
- base_fee_per_gas: U256,
- difficulty: U256,
- gas_limit: U256,
- gas_used: U256,
  hash: H256,
- logs_bloom: Bloom,
- miner: Address,
- mix_hash: H256,
  number: U256,
  parent_hash: H256,
- state_root: H256,
- timestamp: U256,
-
- // Pre-eip-4895 blocks won't have this field, so if it's missing, using an empty vec is fine.
- #[serde(default)]
- withdrawals: Vec<Withdrawal>,
 }
 
 #[derive(Deserialize, Debug)]