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

Ethereum-types and various libs upgrade (#315)

Browse Source 
* Upgrade Eth types

ethereum-types -> 0.9.2
rlp -> 0.4.6
keccak-hash -> 0.5.0
parity-crypto -> 0.6.2
ethabi -> 0.12.0
ethabi-derive -> 0.12.0
ethabi-contract -> 0.11.0
ethbloom -> 0.9.1
rand -> 0.7.3
trie-standardmap -> 0.15.2
triehash -> 0.5.0

* backport #10714. Small changes, merge fixes

Co-authored-by: mdben1247 <mdben1247@users.noreply.github.com>
This commit is contained in:
rakita
2021-03-12 10:12:42 +01:00
committed by GitHub
parent 3f8e0cfec4
commit a0f406e26b
273 changed files with 3051 additions and 4775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/concensus/miner/src/pool/replace.rs
View File

@@ -117,7 +117,7 @@ where
mod tests {
use super::*;
use ethkey::{Generator, KeyPair, Random};
use crypto::publickey::{Generator, KeyPair, Random};
use pool::{
scoring::*,
tests::{
@@ -160,7 +160,7 @@ mod tests {
let replace = ReplaceByScoreAndReadiness::new(scoring, client);
// same sender txs
let keypair = Random.generate().unwrap();
let keypair = Random.generate();
let same_sender_tx1 = local_tx_verified(
Tx {
@@ -190,7 +190,7 @@ mod tests {
);
// different sender txs
let sender1 = Random.generate().unwrap();
let sender1 = Random.generate();
let different_sender_tx1 = local_tx_verified(
Tx {
nonce: 2,
@@ -200,7 +200,7 @@ mod tests {
&sender1,
);
let sender2 = Random.generate().unwrap();
let sender2 = Random.generate();
let different_sender_tx2 = local_tx_verified(
Tx {
nonce: 1,
@@ -274,7 +274,7 @@ mod tests {
..Default::default()
};
let keypair = Random.generate().unwrap();
let keypair = Random.generate();
let txs = vec![tx1, tx2, tx3, tx4]
.into_iter()
.map(|tx| tx.unsigned().sign(keypair.secret(), None).verified())
@@ -440,7 +440,7 @@ mod tests {
let client = TestClient::new().with_nonce(1);
let replace = ReplaceByScoreAndReadiness::new(scoring, client);
let old_sender = Random.generate().unwrap();
let old_sender = Random.generate();
let tx_old_ready_1 = {
let tx = Tx {
nonce: 1,
@@ -518,7 +518,7 @@ mod tests {
tx.signed().verified()
};
let new_sender = Random.generate().unwrap();
let new_sender = Random.generate();
let tx_new_ready_1 = {
let tx = Tx {
nonce: 1,
@@ -586,7 +586,7 @@ mod tests {
tx.signed().verified()
};
let new_sender = Random.generate().unwrap();
let new_sender = Random.generate();
let tx_new_ready_1 = local_tx_verified(
Tx {
nonce: 1,
@@ -641,7 +641,7 @@ mod tests {
tx.signed().verified()
};
let new_sender = Random.generate().unwrap();
let new_sender = Random.generate();
let tx_new_ready_1 = local_tx_verified(
Tx {
nonce: 1,