update substrate/extrinsic-pool (#616)

gguoss · gavofyork · commit 26283291d020 · 2018-08-28T10:54:22.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/substrate/extrinsic-pool/Cargo.toml b/substrate/extrinsic-pool/Cargo.toml
@@ -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]
diff --git a/substrate/extrinsic-pool/src/listener.rs b/substrate/extrinsic-pool/src/listener.rs
@@ -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))
diff --git a/substrate/extrinsic-pool/src/pool.rs b/substrate/extrinsic-pool/src/pool.rs
@@ -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.

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ impl<H, T> txpool::Listener<T> for Listener<H> where`
`87`	`87`	`debug!(target: "extrinsic-pool", "Extrinsic canceled: {:?}", tx);`
`88`	`88`	`}`
`89`	`89`
`90`		`- fn mined(&mut self, tx: &Arc<T>) {`
	`90`	`+ fn culled(&mut self, tx: &Arc<T>) {`
`91`	`91`	`// TODO [ToDr] latest block number?`
`92`	`92`	`let header_hash = Default::default();`
`93`	`93`	`self.fire(tx.hash(), \|watcher\| watcher.finalised(header_hash))`