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

Fetch parity-common crates from crates.io (#9410)

Browse Source 
* Fetch `parity-common` crates from crates.io

* Add doc tests from `patricia-trie` to `patricia-trie-ethereum`
Fix/update a few deps

* [ethkey] upgrade ethereum-types

* [whisper] update deps

* [network] deps

* [network-devp2p] deps

* [journaldb] deps

* [fastmap] deps

* [miner] deps and test fixes

* [machine] deps

* [json] deps

* [hw] deps

* [ethash] deps

* [registrar] deps

* Update a few more dependencies with new ethabi-*

* [updater] Update deps

* deps

* [ethcore] Update deps

* Use new parity-snappy and parity-rocksdb crates

* Updated submodules

* Use parity-snappy 0.1

* Use kvdb-rocksdb 0.1.2

* Don't use latest ethereum/tests

* Fix merge conflicts errors

* Remove superseeded comment

* Address grumbles: add newlines, add/remove spaces
This commit is contained in:
David
2018-09-04 20:13:51 +02:00
committed by GitHub
parent 51eac1926f
commit 72fd1fa58d
91 changed files with 1547 additions and 3719 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
miner/src/pool/tests/mod.rs
View File

@@ -71,7 +71,7 @@ fn should_return_correct_nonces_when_dropped_because_of_limit() {
assert_eq!(txq.status().status.transaction_count, 1);
// then
assert_eq!(txq.next_nonce(TestClient::new(), &sender), Some(nonce + 1.into()));
assert_eq!(txq.next_nonce(TestClient::new(), &sender), Some(nonce + 1));
// when
let tx1 = Tx::gas_price(2).signed();
@@ -123,7 +123,7 @@ fn should_never_drop_local_transactions_from_different_senders() {
assert_eq!(txq.status().status.transaction_count, 2);
// then
assert_eq!(txq.next_nonce(TestClient::new(), &sender), Some(nonce + 2.into()));
assert_eq!(txq.next_nonce(TestClient::new(), &sender), Some(nonce + 2));
// when
let tx1 = Tx::gas_price(2).signed();
@@ -137,7 +137,7 @@ fn should_never_drop_local_transactions_from_different_senders() {
assert_eq!(res, vec![Ok(()), Ok(())]);
assert_eq!(res2, vec![Ok(()), Ok(())]);
assert_eq!(txq.status().status.transaction_count, 6);
assert_eq!(txq.next_nonce(TestClient::new(), &sender), Some(nonce + 2.into()));
assert_eq!(txq.next_nonce(TestClient::new(), &sender), Some(nonce + 2));
}
#[test]
@@ -604,7 +604,7 @@ fn should_return_correct_nonce_when_transactions_from_given_address_exist() {
txq.import(TestClient::new(), vec![tx.local()]);
// then
assert_eq!(txq.next_nonce(TestClient::new(), &from), Some(nonce + 1.into()));
assert_eq!(txq.next_nonce(TestClient::new(), &from), Some(nonce + 1 ));
}
#[test]