Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

update substrate/extrinsic-pool #616

Merged
merged 1 commit into from
Aug 28, 2018
Merged

update substrate/extrinsic-pool #616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion substrate/extrinsic-pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion substrate/extrinsic-pool/src/listener.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion substrate/extrinsic-pool/src/pool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down