pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-29 22:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup transaction pool deps (#4782)

Browse Source 
* Cleanup transaction pool deps

* Fix it properly

* Fix doc test
This commit is contained in:
Bastian Köcher
2020-01-31 12:40:32 +01:00
committed by GitHub
parent ce47bfa2ba
commit 709a899f9d
19 changed files with 140 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/consensus/manual-seal/Cargo.toml
+2 -1
View File
@@ -18,7 +18,7 @@ serde = { version = "1.0", features=["derive"] }
sc-client = { path = "../../../client" }
sc-client-api = { path = "../../../client/api" }
sc-transaction-pool = { path = "../../transaction-pool", features = ["test-helpers"] }
sc-transaction-pool = { path = "../../transaction-pool" }
sp-blockchain = { path = "../../../primitives/blockchain" }
sp-consensus = { package = "sp-consensus", path = "../../../primitives/consensus/common" }
sp-inherents = { path = "../../../primitives/inherents" }
@@ -28,6 +28,7 @@ sp-transaction-pool = { path = "../../../primitives/transaction-pool" }
[dev-dependencies]
sc-basic-authorship = { path = "../../basic-authorship" }
substrate-test-runtime-client = { path = "../../../test-utils/runtime/client" }
substrate-test-runtime-transaction-pool = { path = "../../../test-utils/runtime/transaction-pool" }
tokio = { version = "0.2", features = ["rt-core", "macros"] }
env_logger = "0.7.0"
tempfile = "3.1.0"
substrate/client/consensus/manual-seal/src/lib.rs
+7 -6
View File
@@ -231,8 +231,8 @@ mod tests {
use sc_transaction_pool::{
BasicPool,
txpool::Options,
testing::api::*,
};
use substrate_test_runtime_transaction_pool::{TestApi, uxt};
use sp_transaction_pool::TransactionPool;
use sp_runtime::generic::BlockId;
use sp_blockchain::HeaderBackend;
@@ -241,8 +241,8 @@ mod tests {
use sp_inherents::InherentDataProviders;
use sc_basic_authorship::ProposerFactory;
fn api() -> TestApi {
TestApi::empty()
fn api() -> Arc<TestApi> {
Arc::new(TestApi::empty())
}
#[tokio::test]
@@ -385,7 +385,8 @@ mod tests {
let client = Arc::new(builder.build());
let select_chain = LongestChain::new(backend.clone());
let inherent_data_providers = InherentDataProviders::new();
let pool = Arc::new(BasicPool::new(Options::default(), api()));
let pool_api = api();
let pool = Arc::new(BasicPool::new(Options::default(), pool_api.clone()));
let env = ProposerFactory {
transaction_pool: pool.clone(),
client: client.clone(),
@@ -419,7 +420,7 @@ mod tests {
finalize: false,
}).await.unwrap();
let created_block = rx.await.unwrap().unwrap();
pool.api().increment_nonce(Alice.into());
pool_api.increment_nonce(Alice.into());
// assert that the background task returns ok
assert_eq!(
@@ -449,7 +450,7 @@ mod tests {
}).await.is_ok());
assert!(rx1.await.unwrap().is_ok());
assert!(backend.blockchain().header(BlockId::Number(1)).unwrap().is_some());
pool.api().increment_nonce(Alice.into());
pool_api.increment_nonce(Alice.into());
assert!(pool.submit_one(&BlockId::Number(2), uxt(Alice, 2)).await.is_ok());
let (tx2, rx2) = futures::channel::oneshot::channel();