Fetch parity-common crates from crates.io (#9410)
* 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:
@@ -72,7 +72,7 @@ impl fmt::Display for Status {
|
||||
senders = self.status.senders,
|
||||
mem = self.status.mem_usage / 1024,
|
||||
mem_max = self.limits.max_mem_usage / 1024,
|
||||
gp = self.options.minimal_gas_price / 1_000_000.into(),
|
||||
gp = self.options.minimal_gas_price / 1_000_000,
|
||||
max_gas = cmp::min(self.options.block_gas_limit, self.options.tx_gas_limit),
|
||||
)
|
||||
}
|
||||
@@ -468,7 +468,7 @@ impl TransactionQueue {
|
||||
|
||||
self.pool.read().pending_from_sender(state_readiness, address)
|
||||
.last()
|
||||
.map(|tx| tx.signed().nonce + 1.into())
|
||||
.map(|tx| tx.signed().nonce + 1)
|
||||
}
|
||||
|
||||
/// Retrieve a transaction from the pool.
|
||||
|
||||
Reference in New Issue
Block a user