From bc2c0ea703e2352134cf44297c299eec8013a7f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20D=C3=ADaz?= Date: Tue, 25 May 2021 18:15:34 +0200 Subject: [PATCH] fix: fix 'use' references to 'ethabi' Co-authored-by: Claudia Bartoli Duncan --- bridges/centralized-ethereum/src/actors/dr_database.rs | 3 ++- bridges/centralized-ethereum/src/actors/dr_reporter.rs | 2 +- bridges/centralized-ethereum/src/actors/eth_poller.rs | 2 +- bridges/centralized-ethereum/src/lib.rs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bridges/centralized-ethereum/src/actors/dr_database.rs b/bridges/centralized-ethereum/src/actors/dr_database.rs index 19f01029d..144391352 100644 --- a/bridges/centralized-ethereum/src/actors/dr_database.rs +++ b/bridges/centralized-ethereum/src/actors/dr_database.rs @@ -1,7 +1,8 @@ use actix::prelude::*; use serde::{Deserialize, Serialize}; use std::{cmp, collections::HashMap, fmt}; -use web3::{ethabi::Bytes, types::U256}; +use ethabi::Bytes; +use web3::{types::U256}; use witnet_data_structures::chain::Hash; use witnet_node::storage_mngr; diff --git a/bridges/centralized-ethereum/src/actors/dr_reporter.rs b/bridges/centralized-ethereum/src/actors/dr_reporter.rs index 852ecc31b..54c1428c1 100644 --- a/bridges/centralized-ethereum/src/actors/dr_reporter.rs +++ b/bridges/centralized-ethereum/src/actors/dr_reporter.rs @@ -4,9 +4,9 @@ use crate::{ create_wrb_contract, }; use actix::prelude::*; +use ethabi::Bytes; use web3::{ contract::{self, Contract}, - ethabi::Bytes, types::{H160, U256}, }; use witnet_data_structures::{chain::Hash, radon_error::RadonErrors}; diff --git a/bridges/centralized-ethereum/src/actors/eth_poller.rs b/bridges/centralized-ethereum/src/actors/eth_poller.rs index 888014e38..d01917768 100644 --- a/bridges/centralized-ethereum/src/actors/eth_poller.rs +++ b/bridges/centralized-ethereum/src/actors/eth_poller.rs @@ -5,9 +5,9 @@ use crate::{ }; use actix::prelude::*; use std::{convert::TryFrom, time::Duration}; +use ethabi::Bytes; use web3::{ contract::{self, Contract}, - ethabi::Bytes, types::{H160, U256}, }; use witnet_data_structures::chain::Hash; diff --git a/bridges/centralized-ethereum/src/lib.rs b/bridges/centralized-ethereum/src/lib.rs index 138c711aa..c45144d71 100644 --- a/bridges/centralized-ethereum/src/lib.rs +++ b/bridges/centralized-ethereum/src/lib.rs @@ -26,7 +26,7 @@ pub fn create_wrb_contract(config: &Config) -> Contract { let web3 = web3::Web3::new(web3_http); // Why read files at runtime when you can read files at compile time let wrb_contract_abi_json: &[u8] = include_bytes!("../wrb_abi.json"); - let wrb_contract_abi = web3::ethabi::Contract::load(wrb_contract_abi_json) + let wrb_contract_abi = ethabi::Contract::load(wrb_contract_abi_json) .map_err(|e| format!("Unable to load WRB contract from ABI: {:?}", e)) .unwrap(); let wrb_contract_address = config.wrb_contract_addr;