update substrate/extrinsic-pool (#616)

This commit is contained in:
Guanghua Guo
2018-08-28 17:54:22 +08:00
committed by Gav Wood
parent 3a58595a85
commit f5c684dca6
4 changed files with 7 additions and 7 deletions
+4 -4
View File
@@ -1918,7 +1918,7 @@ dependencies = [
"lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.41 (registry+https://github.com/rust-lang/crates.io-index)",
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
"rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -2497,7 +2497,7 @@ dependencies = [
"substrate-keyring 0.1.0",
"substrate-runtime-primitives 0.1.0",
"substrate-test-client 0.1.0",
"transaction-pool 1.12.3 (registry+https://github.com/rust-lang/crates.io-index)",
"transaction-pool 1.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
@@ -3367,7 +3367,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "transaction-pool"
version = "1.12.3"
version = "1.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3976,7 +3976,7 @@ dependencies = [
"checksum tokio-udp 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "137bda266504893ac4774e0ec4c2108f7ccdbcb7ac8dced6305fe9e4e0b5041a"
"checksum trace-time 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5aea07da6582e957c6e737eeb63a5af79e648eeeaaaba8fd9a417f1124bafa41"
"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079"
"checksum transaction-pool 1.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0f1fc049d9f039d3e9264f97f978309b94b5a5c56a5c18d28f91f469cef2b367"
"checksum transaction-pool 1.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fdb8870eea404a57e2f62056ac45067a53a6207fd31866122356481d3c2e1a30"
"checksum triehash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2033893a813c70e7d8a739ca6c36dc0a7a2c913ec718d7cbf84a3837bbe3c7ce"
"checksum triehash 0.2.0 (git+https://github.com/paritytech/parity-common)" = "<none>"
"checksum try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2"
@@ -10,7 +10,7 @@ error-chain = "0.12"
futures = "0.1"
log = "0.3"
parking_lot = "0.4"
transaction-pool = "1.12"
transaction-pool = "1.13.2"
substrate-runtime-primitives = { path = "../../substrate/runtime/primitives" }
[dev-dependencies]
@@ -87,7 +87,7 @@ impl<H, T> txpool::Listener<T> for Listener<H> where
debug!(target: "extrinsic-pool", "Extrinsic canceled: {:?}", tx);
}
fn mined(&mut self, tx: &Arc<T>) {
fn culled(&mut self, tx: &Arc<T>) {
// TODO [ToDr] latest block number?
let header_hash = Default::default();
self.fire(tx.hash(), |watcher| watcher.finalised(header_hash))
@@ -93,7 +93,7 @@ pub trait ChainApi: Send + Sync {
/// Error type.
type Error: From<txpool::Error> + IntoPoolError;
/// Score type.
type Score: ::std::cmp::Ord + Clone + Default + fmt::Debug + Send + Send + Sync;
type Score: ::std::cmp::Ord + Clone + Default + fmt::Debug + Send + Send + Sync + fmt::LowerHex;
/// Custom scoring update event type.
type Event: ::std::fmt::Debug;
/// Verify extrinsic at given block.