diff --git a/src/contracts.rs b/src/contracts.rs index 09549ae..3783b2c 100644 --- a/src/contracts.rs +++ b/src/contracts.rs @@ -8,6 +8,8 @@ use serde_derive::Deserialize; clippy::needless_update )] pub mod v2 { + use ethabi_contract::use_contract; + use_contract!(key_mgr, "abi/v2/KeysManager.abi.json"); use_contract!(val_meta, "abi/v2/ValidatorMetadata.abi.json"); use_contract!(voting, "abi/v2/VotingToChangeKeys.abi.json"); @@ -17,6 +19,8 @@ pub mod v2 { // The `use_contract!` macro triggers several Clippy warnings. #[allow(clippy::redundant_closure, clippy::needless_update)] pub mod v1 { + use ethabi_contract::use_contract; + use_contract!(voting, "abi/v1/VotingToChangeKeys.abi.json"); } diff --git a/src/error.rs b/src/error.rs index 714b432..995a07a 100644 --- a/src/error.rs +++ b/src/error.rs @@ -1,3 +1,7 @@ +use error_chain::{ + error_chain, error_chain_processing, impl_error_chain_kind, impl_error_chain_processed, + impl_extract_backtrace, +}; use ethabi; use web3; diff --git a/src/main.rs b/src/main.rs index 6d02714..de8ba73 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,3 @@ -#[macro_use] -extern crate error_chain; -#[macro_use(use_contract)] -extern crate ethabi_contract; #[macro_use(EthabiContract)] extern crate ethabi_derive;