pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-10 23:57:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

[big refactor] Remove crate aliasing. (#4395)

Browse Source 
* Rename: Phase 1.

* Unify codec.

* Fixing: Phase 2

* Fixing: Phase 3.

* Fixing: Phase 4.

* Fixing: Phase 5.

* Fixing: Phase 6.

* Fixing: Phase 7.

* Fixing: Phase 8. Tests

* Fixing: Phase 9. Tests!!!

* Fixing: Phase 10. Moar tests!

* Finally done!

* More fixes.

* Rename primitives:: to sp_core::

* Apply renames in finality-grandpa.

* Fix benches.

* Fix benches 2.

* Revert node-template.

* Fix frame-system in our modules.
This commit is contained in:
Tomasz Drwięga
2019-12-16 13:36:49 +01:00
committed by Gavin Wood
parent f14d98a439
commit 8778ca7dc8
485 changed files with 4023 additions and 4005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/transaction-pool/src/maintainer.rs
+21 -21
View File
@@ -26,31 +26,31 @@ use futures::{
use log::{warn, debug, trace};
use parking_lot::Mutex;
use client_api::{
use sc_client_api::{
client::BlockBody,
light::{Fetcher, RemoteBodyRequest},
};
use primitives::{Blake2Hasher, H256};
use sp_core::{Blake2Hasher, H256};
use sp_runtime::{
generic::BlockId,
traits::{Block as BlockT, Extrinsic, Header, NumberFor, ProvideRuntimeApi, SimpleArithmetic},
};
use sp_blockchain::HeaderBackend;
use txpool_api::TransactionPoolMaintainer;
use txpool_api::runtime_api::TaggedTransactionQueue;
use sp_transaction_pool::TransactionPoolMaintainer;
use sp_transaction_pool::runtime_api::TaggedTransactionQueue;
use txpool::{self, ChainApi};
use sc_transaction_graph::{self, ChainApi};
/// Basic transaction pool maintainer for full clients.
pub struct FullBasicPoolMaintainer<Client, PoolApi: ChainApi> {
pool: Arc<txpool::Pool<PoolApi>>,
pool: Arc<sc_transaction_graph::Pool<PoolApi>>,
client: Arc<Client>,
}
impl<Client, PoolApi: ChainApi> FullBasicPoolMaintainer<Client, PoolApi> {
/// Create new basic full pool maintainer.
pub fn new(
pool: Arc<txpool::Pool<PoolApi>>,
pool: Arc<sc_transaction_graph::Pool<PoolApi>>,
client: Arc<Client>,
) -> Self {
FullBasicPoolMaintainer { pool, client }
@@ -61,7 +61,7 @@ impl<Block, Client, PoolApi> TransactionPoolMaintainer
for
FullBasicPoolMaintainer<Client, PoolApi>
where
Block: BlockT<Hash = <Blake2Hasher as primitives::Hasher>::Out>,
Block: BlockT<Hash = <Blake2Hasher as sp_core::Hasher>::Out>,
Client: ProvideRuntimeApi + HeaderBackend<Block> + BlockBody<Block> + 'static,
Client::Api: TaggedTransactionQueue<Block>,
PoolApi: ChainApi<Block = Block, Hash = H256> + 'static,
@@ -143,7 +143,7 @@ where
/// Basic transaction pool maintainer for light clients.
pub struct LightBasicPoolMaintainer<Block: BlockT, Client, PoolApi: ChainApi, F> {
pool: Arc<txpool::Pool<PoolApi>>,
pool: Arc<sc_transaction_graph::Pool<PoolApi>>,
client: Arc<Client>,
fetcher: Arc<F>,
revalidate_time_period: Option<std::time::Duration>,
@@ -154,7 +154,7 @@ pub struct LightBasicPoolMaintainer<Block: BlockT, Client, PoolApi: ChainApi, F>
impl<Block, Client, PoolApi, F> LightBasicPoolMaintainer<Block, Client, PoolApi, F>
where
Block: BlockT<Hash = <Blake2Hasher as primitives::Hasher>::Out>,
Block: BlockT<Hash = <Blake2Hasher as sp_core::Hasher>::Out>,
Client: ProvideRuntimeApi + HeaderBackend<Block> + BlockBody<Block> + 'static,
Client::Api: TaggedTransactionQueue<Block>,
PoolApi: ChainApi<Block = Block, Hash = H256> + 'static,
@@ -165,7 +165,7 @@ impl<Block, Client, PoolApi, F> LightBasicPoolMaintainer<Block, Client, PoolApi,
/// Default constants are: revalidate every 60 seconds or every 20 blocks
/// (whatever happens first).
pub fn with_defaults(
pool: Arc<txpool::Pool<PoolApi>>,
pool: Arc<sc_transaction_graph::Pool<PoolApi>>,
client: Arc<Client>,
fetcher: Arc<F>,
) -> Self {
@@ -180,7 +180,7 @@ impl<Block, Client, PoolApi, F> LightBasicPoolMaintainer<Block, Client, PoolApi,
/// Create light pool maintainer with passed constants.
pub fn new(
pool: Arc<txpool::Pool<PoolApi>>,
pool: Arc<sc_transaction_graph::Pool<PoolApi>>,
client: Arc<Client>,
fetcher: Arc<F>,
revalidate_time_period: Option<std::time::Duration>,
@@ -261,7 +261,7 @@ impl<Block, Client, PoolApi, F> TransactionPoolMaintainer
for
LightBasicPoolMaintainer<Block, Client, PoolApi, F>
where
Block: BlockT<Hash = <Blake2Hasher as primitives::Hasher>::Out>,
Block: BlockT<Hash = <Blake2Hasher as sp_core::Hasher>::Out>,
Client: ProvideRuntimeApi + HeaderBackend<Block> + BlockBody<Block> + 'static,
Client::Api: TaggedTransactionQueue<Block>,
PoolApi: ChainApi<Block = Block, Hash = H256> + 'static,
@@ -355,15 +355,15 @@ mod tests {
use super::*;
use futures::executor::block_on;
use codec::Encode;
use test_client::{prelude::*, runtime::{Block, Transfer}, consensus::{BlockOrigin, SelectChain}};
use txpool_api::PoolStatus;
use substrate_test_runtime_client::{prelude::*, runtime::{Block, Transfer}, sp_consensus::{BlockOrigin, SelectChain}};
use sp_transaction_pool::PoolStatus;
use crate::api::{FullChainApi, LightChainApi};
#[test]
fn should_remove_transactions_from_the_full_pool() {
let (client, longest_chain) = TestClientBuilder::new().build_with_longest_chain();
let client = Arc::new(client);
let pool = txpool::Pool::new(Default::default(), FullChainApi::new(client.clone()));
let pool = sc_transaction_graph::Pool::new(Default::default(), FullChainApi::new(client.clone()));
let pool = Arc::new(pool);
let transaction = Transfer {
amount: 5,
@@ -401,7 +401,7 @@ mod tests {
to: Default::default(),
}.into_signed_tx();
let fetcher_transaction = transaction.clone();
let fetcher = Arc::new(test_client::new_light_fetcher()
let fetcher = Arc::new(substrate_test_runtime_client::new_light_fetcher()
.with_remote_body(Some(Box::new(move |_| Ok(vec![fetcher_transaction.clone()]))))
.with_remote_call(Some(Box::new(move |_| {
let validity: sp_runtime::transaction_validity::TransactionValidity =
@@ -417,7 +417,7 @@ mod tests {
let (client, longest_chain) = TestClientBuilder::new().build_with_longest_chain();
let client = Arc::new(client);
let pool = txpool::Pool::new(Default::default(), LightChainApi::new(
let pool = sc_transaction_graph::Pool::new(Default::default(), LightChainApi::new(
client.clone(),
fetcher.clone(),
));
@@ -473,7 +473,7 @@ mod tests {
let build_fetcher = || {
let validated = Arc::new(atomic::AtomicBool::new(false));
Arc::new(test_client::new_light_fetcher()
Arc::new(substrate_test_runtime_client::new_light_fetcher()
.with_remote_body(Some(Box::new(move |_| Ok(vec![]))))
.with_remote_call(Some(Box::new(move |_| {
let is_inserted = validated.swap(true, atomic::Ordering::SeqCst);
@@ -504,7 +504,7 @@ mod tests {
let client = Arc::new(client);
// now let's prepare pool
let pool = txpool::Pool::new(Default::default(), LightChainApi::new(
let pool = sc_transaction_graph::Pool::new(Default::default(), LightChainApi::new(
client.clone(),
fetcher.clone(),
));
@@ -563,7 +563,7 @@ mod tests {
fn should_add_reverted_transactions_to_the_pool() {
let (client, longest_chain) = TestClientBuilder::new().build_with_longest_chain();
let client = Arc::new(client);
let pool = txpool::Pool::new(Default::default(), FullChainApi::new(client.clone()));
let pool = sc_transaction_graph::Pool::new(Default::default(), FullChainApi::new(client.clone()));
let pool = Arc::new(pool);
let transaction = Transfer {
amount: 5,