separate crate for TxPool + Maintainer trait

Cargo.toml

@@ -66,6 +66,7 @@ members = [
 	"core/test-runtime",
 	"core/test-runtime/client",
 	"core/transaction-pool",
+	"core/transaction-pool/api",
 	"core/transaction-pool/graph",
 	"core/trie",
 	"core/utils/fork-tree",

core/basic-authorship/Cargo.toml

@@ -14,7 +14,8 @@ client = { package = "substrate-client", path = "../../core/client" }
 consensus_common = { package = "substrate-consensus-common", path = "../../core/consensus/common" }
 inherents = { package = "substrate-inherents", path = "../inherents" }
 substrate-telemetry = { path = "../telemetry" }
-transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" }
+txpoolapi = { package = "substrate-transaction-pool-api", path = "../../core/transaction-pool/api" }
 
 [dev-dependencies]
 test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" }
+txpool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" }

core/basic-authorship/src/basic_authorship.rs

@@ -35,7 +35,7 @@ use sr_primitives::{
 	},
 	generic::BlockId,
 };
-use transaction_pool::TransactionPool;
+use txpoolapi::{TransactionPool, InPoolTransaction};
 use substrate_telemetry::{telemetry, CONSENSUS_INFO};
 
 /// Proposer factory.
@@ -160,21 +160,23 @@ impl<Block, B, E, RA, A> Proposer<Block, SubstrateClient<B, E, Block, RA>, A>	wh
 		let pending_iterator = self.transaction_pool.ready();
 
 		debug!("Attempting to push transactions from the pool.");
-		for pending in pending_iterator {
+		for pending_tx in pending_iterator {
 			if (self.now)() > deadline {
 				debug!("Consensus deadline reached when pushing block transactions, proceeding with proposing.");
 				break;
 			}
 
-			trace!("[{:?}] Pushing to the block.", pending.hash);
-			match client::block_builder::BlockBuilder::push(&mut block_builder, pending.data.clone()) {
+			let pending_tx_data = pending_tx.data().clone();
+			let pending_tx_hash = pending_tx.hash().clone();
+			trace!("[{:?}] Pushing to the block.", pending_tx_hash);
+			match client::block_builder::BlockBuilder::push(&mut block_builder, pending_tx_data) {
 				Ok(()) => {
-					debug!("[{:?}] Pushed to the block.", pending.hash);
+					debug!("[{:?}] Pushed to the block.", pending_tx_hash);
 				}
 				Err(error::Error::ApplyExtrinsicFailed(e)) if e.exhausted_resources() => {
 					if is_first {
-						debug!("[{:?}] Invalid transaction: FullBlock on empty block", pending.hash);
-						unqueue_invalid.push(pending.hash.clone());
+						debug!("[{:?}] Invalid transaction: FullBlock on empty block", pending_tx_hash);
+						unqueue_invalid.push(pending_tx_hash);
 					} else if skipped < MAX_SKIPPED_TRANSACTIONS {
 						skipped += 1;
 						debug!(
@@ -187,8 +189,8 @@ impl<Block, B, E, RA, A> Proposer<Block, SubstrateClient<B, E, Block, RA>, A>	wh
 					}
 				}
 				Err(e) => {
-					debug!("[{:?}] Invalid transaction: {}", pending.hash, e);
-					unqueue_invalid.push(pending.hash.clone());
+					debug!("[{:?}] Invalid transaction: {}", pending_tx_hash, e);
+					unqueue_invalid.push(pending_tx_hash);
 				}
 			}
 
@@ -233,7 +235,7 @@ mod tests {
 	use std::cell::RefCell;
 	use consensus_common::{Environment, Proposer};
 	use test_client::{self, runtime::{Extrinsic, Transfer}, AccountKeyring};
-	use transaction_pool::BasicTransactionPool;
+	use txpool::{BasicPool, FullChainApi};
 
 	fn extrinsic(nonce: u64) -> Extrinsic {
 		Transfer {
@@ -248,7 +250,7 @@ mod tests {
 	fn should_cease_building_block_when_deadline_is_reached() {
 		// given
 		let client = Arc::new(test_client::new());
-		let txpool = Arc::new(BasicTransactionPool::default_full(Default::default(), client.clone()));
+		let txpool = Arc::new(BasicPool::new(Default::default(), FullChainApi::new(client.clone())));
 
 		futures::executor::block_on(
 			txpool.submit_at(&BlockId::number(0), vec![extrinsic(0), extrinsic(1)])

core/offchain/Cargo.toml

@@ -24,7 +24,7 @@ parking_lot = "0.9.0"
 primitives = { package = "substrate-primitives", path = "../../core/primitives" }
 rand = "0.7.2"
 sr-primitives = { path = "../../core/sr-primitives" }
-transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" }
+txpoolapi = { package = "substrate-transaction-pool-api", path = "../../core/transaction-pool/api" }
 network = { package = "substrate-network", path = "../../core/network" }
 keystore = { package = "substrate-keystore", path = "../keystore" }
 
@@ -33,6 +33,7 @@ env_logger = "0.7.0"
 client-db = { package = "substrate-client-db", path = "../../core/client/db/", default-features = true }
 test-client = { package = "substrate-test-runtime-client", path = "../../core/test-runtime/client" }
 tokio = "0.1.22"
+txpool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" }
 
 [features]
 default = []

core/offchain/src/api.rs

@@ -31,7 +31,7 @@ use primitives::offchain::{
 	OpaqueNetworkState, OpaquePeerId, OpaqueMultiaddr, StorageKind,
 };
 use sr_primitives::{generic::BlockId, traits::{self, Extrinsic}};
-use transaction_pool::TransactionPool;
+use txpoolapi::TransactionPool;
 
 mod http;
 mod timestamp;
@@ -335,7 +335,7 @@ mod tests {
 	use client_db::offchain::LocalStorage;
 	use network::PeerId;
 	use test_client::runtime::Block;
-	use transaction_pool::BasicTransactionPool;
+	use txpool::{BasicPool, FullChainApi};
 
 	struct MockNetworkStateInfo();
 
@@ -353,7 +353,7 @@ mod tests {
 		let _ = env_logger::try_init();
 		let db = LocalStorage::new_test();
 		let client = Arc::new(test_client::new());
-		let pool = Arc::new(BasicTransactionPool::default_full(Default::default(), client.clone()));
+		let pool = Arc::new(BasicPool::new(Default::default(), FullChainApi::new(client.clone())));
 
 		let mock = Arc::new(MockNetworkStateInfo());
 		AsyncApi::new(

core/offchain/src/lib.rs

@@ -47,7 +47,7 @@ use log::{debug, warn};
 use network::NetworkStateInfo;
 use primitives::{offchain, ExecutionContext};
 use sr_primitives::{generic::BlockId, traits::{self, ProvideRuntimeApi}};
-use transaction_pool::TransactionPool;
+use txpoolapi::TransactionPool;
 
 mod api;
 
@@ -156,7 +156,8 @@ impl<Client, Storage, Block> OffchainWorkers<
 mod tests {
 	use super::*;
 	use network::{Multiaddr, PeerId};
-	use transaction_pool::BasicTransactionPool;
+	use txpool::{BasicPool, FullChainApi};
+	use txpoolapi::InPoolTransaction;
 
 	struct MockNetworkStateInfo();
 
@@ -175,7 +176,7 @@ mod tests {
 		// given
 		let _ = env_logger::try_init();
 		let client = Arc::new(test_client::new());
-		let pool = Arc::new(BasicTransactionPool::default_full(Default::default(), client.clone()));
+		let pool = Arc::new(BasicPool::new(Default::default(), FullChainApi::new(client.clone())));
 		let db = client_db::offchain::LocalStorage::new_test();
 		let network_state = Arc::new(MockNetworkStateInfo());
 

core/rpc/Cargo.toml

@@ -21,7 +21,7 @@ rpc-primitives = { package = "substrate-rpc-primitives", path = "primitives" }
 state_machine = { package = "substrate-state-machine", path = "../state-machine" }
 substrate-executor = { path = "../executor" }
 substrate-keystore = { path = "../keystore" }
-transaction_pool = { package = "substrate-transaction-pool", path = "../transaction-pool" }
+txpoolapi = { package = "substrate-transaction-pool-api", path = "../transaction-pool/api" }
 hash-db = { version = "0.15.2", default-features = false }
 parking_lot = { version = "0.9.0" }
 
@@ -33,3 +33,4 @@ rustc-hex = "2.0.1"
 sr-io = { path = "../sr-io" }
 test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client" }
 tokio = "0.1.22"
+txpool = { package = "substrate-transaction-pool", path = "../transaction-pool" }

core/rpc/api/Cargo.toml

@@ -18,5 +18,5 @@ primitives = { package = "substrate-primitives", path = "../../primitives" }
 runtime_version = { package = "sr-version", path = "../../sr-version" }
 serde = { version = "1.0.101", features = ["derive"] }
 serde_json = "1.0.41"
-txpool = { package = "substrate-transaction-graph", path = "../../transaction-pool/graph" }
+txpoolapi = { package = "substrate-transaction-pool-api", path = "../../transaction-pool/api" }
 rpc-primitives = { package = "substrate-rpc-primitives", path = "../../rpc/primitives" }

core/rpc/api/src/author/error.rs

@@ -33,7 +33,7 @@ pub enum Error {
 	Client(Box<dyn std::error::Error + Send>),
 	/// Transaction pool error,
 	#[display(fmt="Transaction pool error: {}", _0)]
-	Pool(txpool::error::Error),
+	Pool(txpoolapi::error::Error),
 	/// Verification error
 	#[display(fmt="Extrinsic verification error: {}", _0)]
 	Verification(Box<dyn std::error::Error + Send>),
@@ -91,7 +91,7 @@ const UNSUPPORTED_KEY_TYPE: i64 = POOL_INVALID_TX + 7;
 
 impl From<Error> for rpc::Error {
 	fn from(e: Error) -> Self {
-		use txpool::error::{Error as PoolError};
+		use txpoolapi::error::{Error as PoolError};
 
 		match e {
 			Error::BadFormat(e) => rpc::Error {

core/rpc/api/src/author/mod.rs

@@ -21,11 +21,9 @@ pub mod hash;
 
 use jsonrpc_derive::rpc;
 use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId};
-use primitives::{
-	Bytes
-};
+use primitives::Bytes;
+use txpoolapi::TransactionStatus;
 use self::error::{FutureResult, Result};
-use txpool::watcher::Status;
 
 pub use self::gen_client::Client as AuthorClient;
 
@@ -69,7 +67,7 @@ pub trait AuthorApi<Hash, BlockHash> {
 	)]
 	fn watch_extrinsic(&self,
 		metadata: Self::Metadata,
-		subscriber: Subscriber<Status<Hash, BlockHash>>,
+		subscriber: Subscriber<TransactionStatus<Hash, BlockHash>>,
 		bytes: Bytes
 	);