MallocSizeOf impl on transaction pool broke stuff because wasm_timer:…

…:Instant doesnt impl it so just revert the transaction pool to master

client/informant/Cargo.toml

@@ -16,3 +16,4 @@ sc-network = { version = "0.8", path = "../network" }
 sc-service = { version = "0.8", default-features = false, path = "../service" }
 sp-blockchain = { version = "2.0.0", path = "../../primitives/blockchain" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
+parity-util-mem = { version = "0.5.1", default-features = false, features = ["primitive-types"] }

client/transaction-pool/Cargo.toml

@@ -12,7 +12,6 @@ futures = { version = "0.3.1", features = ["compat"] }
 futures-diagnose = "1.0"
 log = "0.4.8"
 parking_lot = "0.10.0"
-wasm-timer = "0.2"
 sp-core = { version = "2.0.0", path = "../../primitives/core" }
 sp-api = { version = "2.0.0", path = "../../primitives/api" }
 sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }

client/transaction-pool/graph/Cargo.toml

@@ -11,7 +11,6 @@ futures = "0.3.1"
 log = "0.4.8"
 parking_lot = "0.10.0"
 serde = { version = "1.0.101", features = ["derive"] }
-wasm-timer = "0.2"
 sp-core = { version = "2.0.0", path = "../../../primitives/core" }
 sp-runtime = { version = "2.0.0", path = "../../../primitives/runtime" }
 sp-transaction-pool = { version = "2.0.0", path = "../../../primitives/transaction-pool" }

client/transaction-pool/graph/src/future.rs

@@ -19,13 +19,13 @@ use std::{
 	fmt,
 	hash,
 	sync::Arc,
+	time,
 };
 
 use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::transaction_validity::{
 	TransactionTag as Tag,
 };
-use wasm_timer::Instant;
 
 use crate::base_pool::Transaction;
 
@@ -37,7 +37,7 @@ pub struct WaitingTransaction<Hash, Ex> {
 	/// Tags that are required and have not been satisfied yet by other transactions in the pool.
 	pub missing_tags: HashSet<Tag>,
 	/// Time of import to the Future Queue.
-	pub imported_at: Instant,
+	pub imported_at: time::Instant,
 }
 
 impl<Hash: fmt::Debug, Ex: fmt::Debug> fmt::Debug for WaitingTransaction<Hash, Ex> {
@@ -91,7 +91,7 @@ impl<Hash, Ex> WaitingTransaction<Hash, Ex> {
 		WaitingTransaction {
 			transaction: Arc::new(transaction),
 			missing_tags,
-			imported_at: Instant::now(),
+			imported_at: time::Instant::now(),
 		}
 	}
 

client/transaction-pool/graph/src/pool.rs

@@ -34,7 +34,6 @@ use sp_runtime::{
 	transaction_validity::{TransactionValidity, TransactionTag as Tag, TransactionValidityError},
 };
 use sp_transaction_pool::{error, PoolStatus};
-use wasm_timer::Instant;
 
 use crate::validated_pool::{ValidatedPool, ValidatedTransaction};
 
@@ -190,6 +189,7 @@ impl<B: ChainApi> Pool<B> {
 		at: &BlockId<B::Block>,
 		max: Option<usize>,
 	) -> Result<(), B::Error> {
+		use std::time::Instant;
 		log::debug!(target: "txpool",
 			"Fetching ready transactions (up to: {})",
 			max.map(|x| format!("{}", x)).unwrap_or_else(|| "all".into())
@@ -317,7 +317,7 @@ impl<B: ChainApi> Pool<B> {
 		// Make sure that we don't revalidate extrinsics that were part of the recently
 		// imported block. This is especially important for UTXO-like chains cause the
 		// inputs are pruned so such transaction would go to future again.
-		self.validated_pool.ban(&Instant::now(), known_imported_hashes.clone().into_iter());
+		self.validated_pool.ban(&std::time::Instant::now(), known_imported_hashes.clone().into_iter());
 
 		// Try to re-validate pruned transactions since some of them might be still valid.
 		// note that `known_imported_hashes` will be rejected here due to temporary ban.
@@ -469,7 +469,10 @@ impl<B: ChainApi> Clone for Pool<B> {
 
 #[cfg(test)]
 mod tests {
-	use std::collections::{HashMap, HashSet};
+	use std::{
+		collections::{HashMap, HashSet},
+		time::Instant,
+	};
 	use parking_lot::Mutex;
 	use futures::executor::block_on;
 	use super::*;
@@ -478,7 +481,6 @@ mod tests {
 	use codec::Encode;
 	use substrate_test_runtime::{Block, Extrinsic, Transfer, H256, AccountId};
 	use assert_matches::assert_matches;
-	use wasm_timer::Instant;
 	use crate::base_pool::Limit;
 
 	const INVALID_NONCE: u64 = 254;

client/transaction-pool/graph/src/rotator.rs

@@ -23,10 +23,9 @@ use std::{
 	collections::HashMap,
 	hash,
 	iter,
-	time::Duration,
+	time::{Duration, Instant},
 };
 use parking_lot::RwLock;
-use wasm_timer::Instant;
 
 use crate::base_pool::Transaction;
 

client/transaction-pool/graph/src/validated_pool.rs

@@ -19,6 +19,7 @@ use std::{
 	fmt,
 	hash,
 	sync::Arc,
+	time,
 };
 
 use crate::base_pool as base;
@@ -36,7 +37,6 @@ use sp_runtime::{
 	transaction_validity::TransactionTag as Tag,
 };
 use sp_transaction_pool::{error, PoolStatus};
-use wasm_timer::Instant;
 
 use crate::base_pool::PruneStatus;
 use crate::pool::{EventStream, Options, ChainApi, BlockHash, ExHash, ExtrinsicFor, TransactionFor};
@@ -100,7 +100,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 	}
 
 	/// Bans given set of hashes.
-	pub fn ban(&self, now: &Instant, hashes: impl IntoIterator<Item=ExHash<B>>) {
+	pub fn ban(&self, now: &std::time::Instant, hashes: impl IntoIterator<Item=ExHash<B>>) {
 		self.rotator.ban(now, hashes)
 	}
 
@@ -145,7 +145,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 				Ok(imported.hash().clone())
 			}
 			ValidatedTransaction::Invalid(hash, err) => {
-				self.rotator.ban(&Instant::now(), std::iter::once(hash));
+				self.rotator.ban(&std::time::Instant::now(), std::iter::once(hash));
 				Err(err.into())
 			},
 			ValidatedTransaction::Unknown(hash, err) => {
@@ -177,7 +177,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 				let removed = pool.enforce_limits(ready_limit, future_limit)
 					.into_iter().map(|x| x.hash.clone()).collect::<HashSet<_>>();
 				// ban all removed transactions
-				self.rotator.ban(&Instant::now(), removed.iter().map(|x| x.clone()));
+				self.rotator.ban(&std::time::Instant::now(), removed.iter().map(|x| x.clone()));
 				removed
 			};
 			// run notifications
@@ -208,7 +208,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 					.map(|_| watcher)
 			},
 			ValidatedTransaction::Invalid(hash, err) => {
-				self.rotator.ban(&Instant::now(), std::iter::once(hash));
+				self.rotator.ban(&std::time::Instant::now(), std::iter::once(hash));
 				Err(err.into())
 			},
 			ValidatedTransaction::Unknown(_, err) => Err(err.into()),
@@ -430,7 +430,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 		let block_number = self.api.block_id_to_number(at)?
 			.ok_or_else(|| error::Error::InvalidBlockId(format!("{:?}", at)).into())?
 			.saturated_into::<u64>();
-		let now = Instant::now();
+		let now = time::Instant::now();
 		let to_remove = {
 			self.ready()
 				.filter(|tx| self.rotator.ban_if_stale(&now, block_number, &tx))
@@ -497,7 +497,7 @@ impl<B: ChainApi> ValidatedPool<B> {
 		debug!(target: "txpool", "Removing invalid transactions: {:?}", hashes);
 
 		// temporarily ban invalid transactions
-		self.rotator.ban(&Instant::now(), hashes.iter().cloned());
+		self.rotator.ban(&time::Instant::now(), hashes.iter().cloned());
 
 		let invalid = self.pool.write().remove_subtree(hashes);
 

client/transaction-pool/src/lib.rs

@@ -28,7 +28,7 @@ pub mod testing;
 pub use sc_transaction_graph as txpool;
 pub use crate::api::{FullChainApi, LightChainApi};
 
-use std::{collections::HashMap, sync::Arc, pin::Pin};
+use std::{collections::HashMap, sync::Arc, pin::Pin, time::Instant};
 use futures::{Future, FutureExt, future::ready};
 use parking_lot::Mutex;
 
@@ -41,7 +41,6 @@ use sp_transaction_pool::{
 	TxHash, TransactionFor, TransactionStatusStreamFor, BlockHash,
 	MaintainedTransactionPool, PoolFuture,
 };
-use wasm_timer::Instant;
 
 /// Basic implementation of transaction pool that can be customized by providing PoolApi.
 pub struct BasicPool<PoolApi, Block>
@@ -206,7 +205,7 @@ enum RevalidationStatus<N> {
 	/// The revalidation has never been completed.
 	NotScheduled,
 	/// The revalidation is scheduled.
-	Scheduled(Option<Instant>, Option<N>),
+	Scheduled(Option<std::time::Instant>, Option<N>),
 	/// The revalidation is in progress.
 	InProgress,
 }