From d5aac9619e9b28f1334cbbd311714fddb38e899c Mon Sep 17 00:00:00 2001 From: Wolfgang Welz Date: Thu, 11 Jan 2024 20:20:08 +0100 Subject: [PATCH] improve errors --- host/src/bin/op-derive.rs | 2 +- lib/src/optimism/batcher_db.rs | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/host/src/bin/op-derive.rs b/host/src/bin/op-derive.rs index 7c1011f8..d7d00cf6 100644 --- a/host/src/bin/op-derive.rs +++ b/host/src/bin/op-derive.rs @@ -137,7 +137,7 @@ async fn main() -> Result<()> { let output_mem = DeriveMachine::new(&OPTIMISM_CHAIN_SPEC, derive_input.clone()) .context("Could not create derive machine")? .derive() - .unwrap(); + .context("could not derive")?; assert_eq!(output, output_mem); } diff --git a/lib/src/optimism/batcher_db.rs b/lib/src/optimism/batcher_db.rs index ad571310..b00b71c6 100644 --- a/lib/src/optimism/batcher_db.rs +++ b/lib/src/optimism/batcher_db.rs @@ -14,7 +14,7 @@ use std::collections::HashMap; -use anyhow::{ensure, Result}; +use anyhow::{ensure, Context, Result}; use serde::{Deserialize, Serialize}; use zeth_primitives::{ block::Header, @@ -99,7 +99,10 @@ impl BatcherDb for MemDb { } fn get_op_block_header(&mut self, block_no: u64) -> Result
{ - let op_block = self.op_block_header.remove(&block_no).unwrap(); + let op_block = self + .op_block_header + .remove(&block_no) + .context("not or no longer in db")?; assert_eq!(block_no, op_block.number); Ok(op_block) @@ -156,7 +159,10 @@ impl BatcherDb for MemDb { } fn get_eth_block_header(&mut self, block_no: u64) -> Result
{ - let eth_block = self.eth_block_header.remove(&block_no).unwrap(); + let eth_block = self + .eth_block_header + .remove(&block_no) + .context("not or no longer in db")?; assert_eq!(block_no, eth_block.number); Ok(eth_block)