Update dependencies and bigint api (#5685)

* 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
openethereum · May 24, 2017 · e1fef5c · e1fef5c
1 parent cbcc369
commit e1fef5c
Show file tree

Hide file tree

Showing 60 changed files with 96 additions and 101 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml
@@ -20,7 +20,7 @@ ethcore-ipc = { path = "../../ipc/rpc", optional = true }
 ethcore-devtools = { path = "../../devtools" }
 rlp = { path = "../../util/rlp" }
 time = "0.1"
-smallvec = "0.3.1"
+smallvec = "0.4"
 futures = "0.1"
 rand = "0.3"
 itertools = "0.5"

diff --git a/ethcore/light/src/net/load_timer.rs b/ethcore/light/src/net/load_timer.rs
@@ -32,7 +32,7 @@ use request::{CompleteRequest, Kind};
 
 use bincode;
 use time;
-use util::{Uint, RwLock, Mutex};
+use util::{RwLock, Mutex};
 
 /// Number of time periods samples should be kept for.
 pub const MOVING_SAMPLE_SIZE: usize = 256;

diff --git a/ethcore/native_contracts/generator/src/lib.rs b/ethcore/native_contracts/generator/src/lib.rs
@@ -48,7 +48,7 @@ pub fn generate_module(struct_name: &str, abi: &str) -> Result<String, Error> {
 use byteorder::{{BigEndian, ByteOrder}};
 use futures::{{future, Future, IntoFuture, BoxFuture}};
 use ethabi::{{Contract, Interface, Token, Event}};
-use util::{{self, Uint}};
+use util;
 
 /// Generated Rust bindings to an Ethereum contract.
 #[derive(Clone, Debug)]

diff --git a/ethcore/src/action_params.rs b/ethcore/src/action_params.rs
@@ -15,7 +15,7 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Evm input params.
-use util::{Address, Bytes, Uint, U256};
+use util::{Address, Bytes, U256};
 use util::hash::{H256};
 use util::sha3::{Hashable, SHA3_EMPTY};
 use ethjson;

diff --git a/ethcore/src/block.rs b/ethcore/src/block.rs
@@ -21,7 +21,7 @@ use std::sync::Arc;
 use std::collections::HashSet;
 
 use rlp::{UntrustedRlp, RlpStream, Encodable, Decodable, DecoderError};
-use util::{Bytes, Address, Uint, Hashable, U256, H256, ordered_trie_root, SHA3_NULL_RLP};
+use util::{Bytes, Address, Hashable, U256, H256, ordered_trie_root, SHA3_NULL_RLP};
 use util::error::{Mismatch, OutOfBounds};
 
 use basic_types::{LogBloom, Seal};

diff --git a/ethcore/src/builtin.rs b/ethcore/src/builtin.rs
@@ -23,7 +23,7 @@ use crypto::ripemd160::Ripemd160 as Ripemd160Digest;
 use crypto::digest::Digest;
 use num::{BigUint, Zero, One};
 
-use util::{U256, H256, Uint, Hashable, BytesRef};
+use util::{U256, H256, Hashable, BytesRef};
 use ethkey::{Signature, recover as ec_recover};
 use ethjson;
 

diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
@@ -25,7 +25,7 @@ use time::precise_time_ns;
 // util
 use util::{Bytes, PerfTimer, Itertools, Mutex, RwLock, MutexGuard, Hashable};
 use util::{journaldb, DBValue, TrieFactory, Trie};
-use util::{U256, H256, Address, H2048, Uint};
+use util::{U256, H256, Address, H2048};
 use util::trie::TrieSpec;
 use util::kvdb::*;
 

diff --git a/ethcore/src/engines/tendermint/params.rs b/ethcore/src/engines/tendermint/params.rs
@@ -17,7 +17,7 @@
 //! Tendermint specific parameters.
 
 use ethjson;
-use util::{U256, Uint, Address};
+use util::{U256, Address};
 use time::Duration;
 use super::super::validator_set::{ValidatorSet, new_validator_set};
 use super::super::transition::Timeouts;

diff --git a/ethcore/src/evm/evm.rs b/ethcore/src/evm/evm.rs
@@ -17,7 +17,7 @@
 //! Evm interface.
 
 use std::{ops, cmp, fmt};
-use util::{U128, U256, U512, Uint, trie};
+use util::{U128, U256, U512, trie};
 use action_params::ActionParams;
 use evm::Ext;
 use builtin;
@@ -181,11 +181,11 @@ impl CostType for U256 {
 	}
 
 	fn overflow_add(self, other: Self) -> (Self, bool) {
-		Uint::overflowing_add(self, other)
+		self.overflowing_add(other)
 	}
 
 	fn overflow_mul(self, other: Self) -> (Self, bool) {
-		Uint::overflowing_mul(self, other)
+		self.overflowing_mul(other)
 	}
 
 	fn overflow_mul_shr(self, other: Self, shr: usize) -> (Self, bool) {
@@ -250,7 +250,7 @@ pub trait Evm {
 
 #[cfg(test)]
 mod tests {
-	use util::{U256, Uint};
+	use util::U256;
 	use super::CostType;
 
 	#[test]

diff --git a/ethcore/src/evm/factory.rs b/ethcore/src/evm/factory.rs
@@ -20,7 +20,7 @@
 use std::fmt;
 use std::sync::Arc;
 use evm::Evm;
-use util::{U256, Uint};
+use util::U256;
 use super::interpreter::SharedCache;
 
 #[derive(Debug, PartialEq, Clone)]

diff --git a/ethcore/src/evm/interpreter/memory.rs b/ethcore/src/evm/interpreter/memory.rs
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-use util::{U256, Uint};
+use util::U256;
 
 pub trait Memory {
 	/// Retrieve current size of the memory

diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs
@@ -561,7 +561,7 @@ mod tests {
 	use std::sync::Arc;
 	use ethkey::{Generator, Random};
 	use super::*;
-	use util::{H256, U256, U512, Address, Uint, FromHex, FromStr};
+	use util::{H256, U256, U512, Address, FromHex, FromStr};
 	use util::bytes::BytesRef;
 	use action_params::{ActionParams, ActionValue};
 	use env_info::EnvInfo;

diff --git a/ethcore/src/miner/banning_queue.rs b/ethcore/src/miner/banning_queue.rs
@@ -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 {

diff --git a/ethcore/src/miner/miner.rs b/ethcore/src/miner/miner.rs
@@ -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;

diff --git a/ethcore/src/miner/service_transaction_checker.rs b/ethcore/src/miner/service_transaction_checker.rs
@@ -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";
 

diff --git a/ethcore/src/miner/transaction_queue.rs b/ethcore/src/miner/transaction_queue.rs
@@ -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};