chain: Address review comments

In particular, restore some important error analysis in EthereumAdapter
that got lost in the rebase

Author: lutter

chain/ethereum/src/ethereum_adapter.rs

@@ -1,4 +1,3 @@
-use anyhow::Context;
 use futures::future;
 use futures::prelude::*;
 use graph::blockchain::BlockHash;
@@ -510,6 +509,9 @@ impl EthereumAdapter {
                     const PARITY_BAD_JUMP_PREFIX: &str = "Bad jump";
                     const PARITY_STACK_LIMIT_PREFIX: &str = "Out of stack";
 
+                    // See f0af4ab0-6b7c-4b68-9141-5b79346a5f61.
+                    const PARITY_OUT_OF_GAS: &str = "Out of gas";
+
                     const PARITY_VM_EXECUTION_ERROR: i64 = -32015;
                     const PARITY_REVERT_PREFIX: &str = "Reverted 0x";
 
@@ -549,7 +551,7 @@ impl EthereumAdapter {
                         Err(web3::Error::Rpc(rpc_error))
                             if GETH_EXECUTION_ERRORS
                                 .iter()
-                                .any(|e| rpc_error.message.contains(e)) =>
+                                .any(|e| rpc_error.message.to_lowercase().contains(e)) =>
                         {
                             Err(EthereumContractCallError::Revert(rpc_error.message))
                         }
@@ -564,7 +566,8 @@ impl EthereumAdapter {
                                         || data.starts_with(PARITY_BAD_JUMP_PREFIX)
                                         || data.starts_with(PARITY_STACK_LIMIT_PREFIX)
                                         || data == PARITY_BAD_INSTRUCTION_FE
-                                        || data == PARITY_BAD_INSTRUCTION_FD =>
+                                        || data == PARITY_BAD_INSTRUCTION_FD
+                                        || data == PARITY_OUT_OF_GAS =>
                                 {
                                     let reason = if data == PARITY_BAD_INSTRUCTION_FE {
                                         PARITY_BAD_INSTRUCTION_FE.to_owned()
@@ -829,11 +832,7 @@ impl EthereumAdapter {
                 .timeout_secs(*JSON_RPC_TIMEOUT)
                 .run(move || {
                     let web3 = web3.cheap_clone();
-                    async move {
-                        {
-                            web3.eth().chain_id().await
-                        }
-                    }
+                    async move { web3.eth().chain_id().await }
                 })
                 .await?,
         )
@@ -860,7 +859,7 @@ impl EthereumAdapterTrait for EthereumAdapter {
             .timeout_secs(20)
             .run(move || {
                 let web3 = web3.cheap_clone();
-                async move { web3.net().version().await.with_context(|| "boom") }
+                async move { web3.net().version().await.map_err(Into::into) }
             })
             .boxed();
 

chain/ethereum/src/trigger.rs

@@ -363,10 +363,9 @@ pub struct EthereumTransactionData {
 
 impl From<&'_ Transaction> for EthereumTransactionData {
     fn from(tx: &Transaction) -> EthereumTransactionData {
-        // Old versions of web3 (before commit 11277e07) always had a value
-        // for `from`; newer versions make this an option, but it's not
-        // clear what the value should be if this is ever `None`
-        let from = tx.from.expect("tx.from must have a value");
+        // unwrap: this is always `Some` for txns that have been mined
+        //         (see https://github.com/tomusdrw/rust-web3/pull/407)
+        let from = tx.from.unwrap();
         EthereumTransactionData {
             hash: tx.hash,
             index: tx.transaction_index.unwrap().as_u64().into(),