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

* 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
+4 -4
View File
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
[dependencies]
client = { package = "sc-client", path = "../../../../client/" }
sc-client = { path = "../../../../client/" }
codec = { package = "parity-scale-codec", version = "1.0.0" }
futures = "0.3.1"
jsonrpc-core = "14.0.3"
@@ -17,9 +17,9 @@ sp-runtime = { path = "../../../../primitives/runtime" }
frame-system-rpc-runtime-api = { path = "../../../../frame/system/rpc/runtime-api" }
sp-core = { path = "../../../../primitives/core" }
sp-blockchain = { path = "../../../../primitives/blockchain" }
txpool-api = { package = "sp-transaction-pool", path = "../../../../primitives/transaction-pool" }
sp-transaction-pool = { path = "../../../../primitives/transaction-pool" }
[dev-dependencies]
test-client = { package = "substrate-test-runtime-client", path = "../../../../test-utils/runtime/client" }
substrate-test-runtime-client = { path = "../../../../test-utils/runtime/client" }
env_logger = "0.7.0"
txpool = { package = "sc-transaction-pool", path = "../../../../client/transaction-pool" }
sc-transaction-pool = { path = "../../../../client/transaction-pool" }
+5 -5
View File
@@ -19,7 +19,7 @@
use std::sync::Arc;
use codec::{self, Codec, Decode, Encode};
use client::{
use sc_client::{
light::blockchain::{future_header, RemoteBlockchain},
light::fetcher::{Fetcher, RemoteCallRequest},
};
@@ -38,7 +38,7 @@ use sp_runtime::{
traits,
};
use sp_core::hexdisplay::HexDisplay;
use txpool_api::{TransactionPool, InPoolTransaction};
use sp_transaction_pool::{TransactionPool, InPoolTransaction};
pub use frame_system_rpc_runtime_api::AccountNonceApi;
pub use self::gen_client::Client as SystemClient;
@@ -224,17 +224,17 @@ mod tests {
use super::*;
use futures::executor::block_on;
use test_client::{
use substrate_test_runtime_client::{
runtime::Transfer,
AccountKeyring,
};
use txpool::{BasicPool, FullChainApi};
use sc_transaction_pool::{BasicPool, FullChainApi};
#[test]
fn should_return_next_nonce_for_some_account() {
// given
let _ = env_logger::try_init();
let client = Arc::new(test_client::new());
let client = Arc::new(substrate_test_runtime_client::new());
let pool = Arc::new(BasicPool::new(Default::default(), FullChainApi::new(client.clone())));
let new_transaction = |nonce: u64| {