chain: Modernize EthereumAdapter.get_balance and get_code

Author: lutter

chain/ethereum/src/adapter.rs

@@ -7,7 +7,6 @@ use graph::data_source::common::ContractCall;
 use graph::firehose::CallToFilter;
 use graph::firehose::CombinedFilter;
 use graph::firehose::LogFilter;
-use graph::futures01::Future;
 use graph::prelude::web3::types::Bytes;
 use graph::prelude::web3::types::H160;
 use graph::prelude::web3::types::U256;
@@ -1170,20 +1169,20 @@ pub trait EthereumAdapter: Send + Sync + 'static {
         cache: Arc<dyn EthereumCallCache>,
     ) -> Result<Vec<(Option<Vec<Token>>, call::Source)>, ContractCallError>;
 
-    fn get_balance(
+    async fn get_balance(
         &self,
         logger: &Logger,
         address: H160,
         block_ptr: BlockPtr,
-    ) -> Box<dyn Future<Item = U256, Error = EthereumRpcError> + Send>;
+    ) -> Result<U256, EthereumRpcError>;
 
     // Returns the compiled bytecode of a smart contract
-    fn get_code(
+    async fn get_code(
         &self,
         logger: &Logger,
         address: H160,
         block_ptr: BlockPtr,
-    ) -> Box<dyn Future<Item = Bytes, Error = EthereumRpcError> + Send>;
+    ) -> Result<Bytes, EthereumRpcError>;
 }
 
 #[cfg(test)]

chain/ethereum/src/ethereum_adapter.rs

@@ -500,12 +500,12 @@ impl EthereumAdapter {
         }
     }
 
-    fn code(
+    async fn code(
         &self,
         logger: &Logger,
         address: Address,
         block_ptr: BlockPtr,
-    ) -> impl Future<Item = Bytes, Error = EthereumRpcError> + Send {
+    ) -> Result<Bytes, EthereumRpcError> {
         let web3 = self.web3.clone();
         let logger = Logger::new(&logger, o!("provider" => self.provider.clone()));
 
@@ -531,17 +531,16 @@ impl EthereumAdapter {
                     }
                 }
             })
+            .await
             .map_err(|e| e.into_inner().unwrap_or(EthereumRpcError::Timeout))
-            .boxed()
-            .compat()
     }
 
-    fn balance(
+    async fn balance(
         &self,
         logger: &Logger,
         address: Address,
         block_ptr: BlockPtr,
-    ) -> impl Future<Item = U256, Error = EthereumRpcError> + Send {
+    ) -> Result<U256, EthereumRpcError> {
         let web3 = self.web3.clone();
         let logger = Logger::new(&logger, o!("provider" => self.provider.clone()));
 
@@ -567,9 +566,8 @@ impl EthereumAdapter {
                     }
                 }
             })
+            .await
             .map_err(|e| e.into_inner().unwrap_or(EthereumRpcError::Timeout))
-            .boxed()
-            .compat()
     }
 
     async fn call(
@@ -1470,32 +1468,32 @@ impl EthereumAdapterTrait for EthereumAdapter {
             })
     }
 
-    fn get_balance(
+    async fn get_balance(
         &self,
         logger: &Logger,
         address: H160,
         block_ptr: BlockPtr,
-    ) -> Box<dyn Future<Item = U256, Error = EthereumRpcError> + Send> {
+    ) -> Result<U256, EthereumRpcError> {
         debug!(
             logger, "eth_getBalance";
             "address" => format!("{}", address),
             "block" => format!("{}", block_ptr)
         );
-        Box::new(self.balance(logger, address, block_ptr))
+        self.balance(logger, address, block_ptr).await
     }
 
-    fn get_code(
+    async fn get_code(
         &self,
         logger: &Logger,
         address: H160,
         block_ptr: BlockPtr,
-    ) -> Box<dyn Future<Item = Bytes, Error = EthereumRpcError> + Send> {
+    ) -> Result<Bytes, EthereumRpcError> {
         debug!(
             logger, "eth_getCode";
             "address" => format!("{}", address),
             "block" => format!("{}", block_ptr)
         );
-        Box::new(self.code(logger, address, block_ptr))
+        self.code(logger, address, block_ptr).await
     }
 
     async fn next_existing_ptr_to_number(

chain/ethereum/src/runtime/runtime_adapter.rs

@@ -14,7 +14,6 @@ use graph::data::store::scalar::BigInt;
 use graph::data::subgraph::API_VERSION_0_0_9;
 use graph::data_source;
 use graph::data_source::common::{ContractCall, MappingABI};
-use graph::futures03::compat::Future01CompatExt;
 use graph::prelude::web3::types::H160;
 use graph::runtime::gas::Gas;
 use graph::runtime::{AscIndexId, IndexForAscTypeId};
@@ -227,11 +226,7 @@ fn eth_get_balance(
 
     let address: H160 = asc_get(ctx.heap, wasm_ptr.into(), &ctx.gas, 0)?;
 
-    let result = graph::block_on(
-        eth_adapter
-            .get_balance(logger, address, block_ptr.clone())
-            .compat(),
-    );
+    let result = graph::block_on(eth_adapter.get_balance(logger, address, block_ptr.clone()));
 
     match result {
         Ok(v) => {
@@ -265,12 +260,8 @@ fn eth_has_code(
 
     let address: H160 = asc_get(ctx.heap, wasm_ptr.into(), &ctx.gas, 0)?;
 
-    let result = graph::block_on(
-        eth_adapter
-            .get_code(logger, address, block_ptr.clone())
-            .compat(),
-    )
-    .map(|v| !v.0.is_empty());
+    let result = graph::block_on(eth_adapter.get_code(logger, address, block_ptr.clone()))
+        .map(|v| !v.0.is_empty());
 
     match result {
         Ok(v) => Ok(asc_new(ctx.heap, &AscWrapped { inner: v }, &ctx.gas)?),