grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update dependencies and bigint api (#5685)

Browse Source 
* update to latest bigint

* bump elastic array and deps

* fix rlp tests

* also update all smallvec deps

* fix doc test

* reduce parking in attempt to fix CI bug

* fix from/into electum bug

* remove duplicate imports
This commit is contained in:
Nikolay Volf
2017-05-24 13:31:33 +03:00
committed by Arkadiy Paronyan
parent cbcc369a2d
commit e1fef5c732
60 changed files with 96 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ethcore/src/miner/banning_queue.rs
View File

@@ -24,7 +24,7 @@ use transient_hashmap::TransientHashMap;
use miner::{TransactionQueue, TransactionQueueDetailsProvider, TransactionImportResult, TransactionOrigin};
use miner::transaction_queue::QueuingInstant;
use error::{Error, TransactionError};
use util::{Uint, U256, H256, Address, Hashable};
use util::{U256, H256, Address, Hashable};
type Count = u16;
@@ -215,7 +215,7 @@ mod tests {
use error::{Error, TransactionError};
use client::TransactionImportResult;
use miner::{TransactionQueue, TransactionOrigin};
use util::{Uint, U256, Address, FromHex, Hashable};
use util::{U256, Address, FromHex, Hashable};
use miner::transaction_queue::test::DummyTransactionDetailsProvider;
fn queue() -> BanningTransactionQueue {

2
ethcore/src/miner/miner.rs
View File

@@ -1261,7 +1261,7 @@ mod tests {
use super::super::{MinerService, PrioritizationStrategy};
use super::*;
use block::IsBlock;
use util::{U256, Uint, FromHex};
use util::{U256, FromHex};
use ethkey::{Generator, Random};
use client::{BlockChainClient, TestBlockChainClient, EachBlockWith, TransactionImportResult};
use header::BlockNumber;

2
ethcore/src/miner/service_transaction_checker.rs
View File

@@ -20,7 +20,7 @@ use types::ids::BlockId;
use futures::{future, Future};
use native_contracts::ServiceTransactionChecker as Contract;
use util::{U256, Uint, Mutex};
use util::{U256, Mutex};
const SERVICE_TRANSACTION_CONTRACT_REGISTRY_NAME: &'static str = "service_transaction_checker";

4
ethcore/src/miner/transaction_queue.rs
View File

@@ -29,7 +29,7 @@
//! extern crate ethkey;
//! extern crate rustc_serialize;
//!
//! use util::{Uint, U256, Address};
//! use util::{U256, Address};
//! use ethkey::{Random, Generator};
//! use ethcore::miner::{TransactionQueue, RemovalReason, TransactionQueueDetailsProvider, AccountDetails, TransactionOrigin};
//! use ethcore::transaction::*;
@@ -105,7 +105,7 @@ use std::cmp::Ordering;
use std::cmp;
use std::collections::{HashSet, HashMap, BTreeSet, BTreeMap};
use linked_hash_map::LinkedHashMap;
use util::{Address, H256, Uint, U256};
use util::{Address, H256, U256};
use util::table::Table;
use transaction::*;
use error::{Error, TransactionError};