Subgraph Composition: Support declared calls for subgraph datasources

Author: incrypto32

chain/ethereum/src/adapter.rs

@@ -1,8 +1,9 @@
 use anyhow::Error;
-use ethabi::{Error as ABIError, Function, ParamType, Token};
+use ethabi::{Error as ABIError, ParamType, Token};
 use graph::blockchain::ChainIdentifier;
 use graph::components::subgraph::MappingError;
 use graph::data::store::ethereum::call;
+use graph::data_source::common::ContractCall;
 use graph::firehose::CallToFilter;
 use graph::firehose::CombinedFilter;
 use graph::firehose::LogFilter;
@@ -93,16 +94,6 @@ impl EventSignatureWithTopics {
     }
 }
 
-#[derive(Clone, Debug)]
-pub struct ContractCall {
-    pub contract_name: String,
-    pub address: Address,
-    pub block_ptr: BlockPtr,
-    pub function: Function,
-    pub args: Vec<Token>,
-    pub gas: Option<u32>,
-}
-
 #[derive(Error, Debug)]
 pub enum EthereumRpcError {
     #[error("call error: {0}")]