fix(rpc): default to Latest block instead of the backend's if none is… (

gakonst#136) * fix(rpc): default to Latest block instead of the backend's if none is provided * feat(cli): exit -1 if error in tests
meetmangukiya · Nov 17, 2021 · 3184f05 · 3184f05
1 parent 3084676
commit 3184f05
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/dapptools/src/dapp.rs b/dapptools/src/dapp.rs
@@ -252,6 +252,8 @@ fn test<A: ArtifactOutput + 'static, S: Clone, E: evm_adapters::Evm<S>>(
 ) -> eyre::Result<HashMap<String, HashMap<String, dapp::TestResult>>> {
     let mut runner = builder.build(project, evm)?;
 
+    let mut exit_code = 0;
+
     let results = runner.test(pattern)?;
 
     if json {
@@ -272,6 +274,8 @@ fn test<A: ArtifactOutput + 'static, S: Clone, E: evm_adapters::Evm<S>>(
                 let status = if result.success {
                     Colour::Green.paint("[PASS]")
                 } else {
+                    // if an error is found, return a -1 exit code
+                    exit_code = -1;
                     let txt = if let Some(ref reason) = result.reason {
                         format!("[FAIL: {}]", reason)
                     } else {
@@ -308,5 +312,5 @@ fn test<A: ArtifactOutput + 'static, S: Clone, E: evm_adapters::Evm<S>>(
         }
     }
 
-    Ok(results)
+    std::process::exit(exit_code);
 }
diff --git a/evm-adapters/src/blocking_provider.rs b/evm-adapters/src/blocking_provider.rs
@@ -1,4 +1,5 @@
 use ethers::{
+    prelude::BlockNumber,
     providers::Middleware,
     types::{Address, Block, BlockId, Bytes, TxHash, H256, U256, U64},
 };
@@ -30,7 +31,11 @@ where
         self.runtime.block_on(f)
     }
 
-    pub fn block_and_chainid(&self, block_id: BlockId) -> eyre::Result<(Block<TxHash>, U256)> {
+    pub fn block_and_chainid(
+        &self,
+        block_id: Option<impl Into<BlockId>>,
+    ) -> eyre::Result<(Block<TxHash>, U256)> {
+        let block_id = block_id.map(Into::into).unwrap_or(BlockId::Number(BlockNumber::Latest));
         let f = async {
             let block = self.provider.get_block(block_id);
             let chain_id = self.provider.get_chainid();

diff --git a/evm-adapters/src/sputnik/forked_backend/rpc.rs b/evm-adapters/src/sputnik/forked_backend/rpc.rs
@@ -47,7 +47,6 @@ where
         init_cache: BTreeMap<H160, MemoryAccount>,
     ) -> Self {
         let provider = BlockingProvider::new(provider);
-        let pin_block = pin_block.unwrap_or_else(|| backend.block_number().as_u64()).into();
 
         // get the remaining block metadata
         let (block, chain_id) =
@@ -57,7 +56,7 @@ where
             provider,
             backend,
             cache: RefCell::new(init_cache),
-            pin_block: Some(pin_block),
+            pin_block: pin_block.map(Into::into),
             pin_block_meta: block,
             chain_id,
         }