diff --git a/substrate/core/basic-authorship/Cargo.toml b/substrate/core/basic-authorship/Cargo.toml index 955677faf0..9463e3c07f 100644 --- a/substrate/core/basic-authorship/Cargo.toml +++ b/substrate/core/basic-authorship/Cargo.toml @@ -5,14 +5,14 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -client = { package = "substrate-client", path = "../../core/client" } -codec = { package = "parity-codec", version = "4.1.1" } -consensus_common = { package = "substrate-consensus-common", path = "../../core/consensus/common" } -futures-preview = "0.3.0-alpha.17" -inherents = { package = "substrate-inherents", path = "../inherents" } log = "0.4" +futures-preview = "0.3.0-alpha.17" +codec = { package = "parity-codec", version = "4.1.1" } +sr-primitives = { path = "../../core/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../core/primitives" } -runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" } +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" } diff --git a/substrate/core/basic-authorship/src/basic_authorship.rs b/substrate/core/basic-authorship/src/basic_authorship.rs index d7450e4287..2a3fe8dab8 100644 --- a/substrate/core/basic-authorship/src/basic_authorship.rs +++ b/substrate/core/basic-authorship/src/basic_authorship.rs @@ -29,10 +29,10 @@ use consensus_common::{evaluation}; use inherents::InherentData; use log::{error, info, debug, trace}; use primitives::{H256, Blake2Hasher, ExecutionContext}; -use runtime_primitives::{ApplyError, generic::BlockId}; -use runtime_primitives::traits::{ - Block as BlockT, Hash as HashT, Header as HeaderT, ProvideRuntimeApi, - DigestFor, BlakeTwo256, +use sr_primitives::{ + traits::{Block as BlockT, Hash as HashT, Header as HeaderT, ProvideRuntimeApi, DigestFor, BlakeTwo256}, + generic::BlockId, + ApplyError, }; use transaction_pool::txpool::{self, Pool as TransactionPool}; use substrate_telemetry::{telemetry, CONSENSUS_INFO}; diff --git a/substrate/core/basic-authorship/src/lib.rs b/substrate/core/basic-authorship/src/lib.rs index e579dadd83..71c9e27922 100644 --- a/substrate/core/basic-authorship/src/lib.rs +++ b/substrate/core/basic-authorship/src/lib.rs @@ -21,7 +21,7 @@ //! ``` //! # use substrate_basic_authorship::ProposerFactory; //! # use consensus_common::{Environment, Proposer}; -//! # use runtime_primitives::generic::BlockId; +//! # use sr_primitives::generic::BlockId; //! # use std::{sync::Arc, time::Duration}; //! # use test_client::{self, runtime::{Extrinsic, Transfer}, AccountKeyring}; //! # use transaction_pool::txpool::{self, Pool as TransactionPool}; diff --git a/substrate/core/cli/Cargo.toml b/substrate/core/cli/Cargo.toml index bf583a3b7d..53c320035f 100644 --- a/substrate/core/cli/Cargo.toml +++ b/substrate/core/cli/Cargo.toml @@ -25,7 +25,7 @@ serde_json = "1.0" panic-handler = { package = "substrate-panic-handler", path = "../../core/panic-handler" } client = { package = "substrate-client", path = "../../core/client" } network = { package = "substrate-network", path = "../../core/network" } -runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" } +sr-primitives = { path = "../../core/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../core/primitives" } service = { package = "substrate-service", path = "../../core/service" } state-machine = { package = "substrate-state-machine", path = "../../core/state-machine" } diff --git a/substrate/core/cli/src/informant.rs b/substrate/core/cli/src/informant.rs index ca4be4bd1b..e5e46ed17f 100644 --- a/substrate/core/cli/src/informant.rs +++ b/substrate/core/cli/src/informant.rs @@ -20,8 +20,7 @@ use client::{backend::Backend, BlockchainEvents}; use futures::{Future, Stream}; use futures03::{StreamExt as _, TryStreamExt as _}; use log::{info, warn}; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::Header; +use sr_primitives::{generic::BlockId, traits::Header}; use service::{Service, Components}; use tokio::runtime::TaskExecutor; diff --git a/substrate/core/cli/src/informant/display.rs b/substrate/core/cli/src/informant/display.rs index 82bae3358d..c7cf9bfc93 100644 --- a/substrate/core/cli/src/informant/display.rs +++ b/substrate/core/cli/src/informant/display.rs @@ -18,7 +18,7 @@ use ansi_term::Colour; use client::ClientInfo; use log::info; use network::SyncState; -use runtime_primitives::traits::{Block as BlockT, CheckedDiv, NumberFor, Zero, Saturating}; +use sr_primitives::traits::{Block as BlockT, CheckedDiv, NumberFor, Zero, Saturating}; use service::NetworkStatus; use std::{convert::{TryFrom, TryInto}, fmt, time}; diff --git a/substrate/core/client/Cargo.toml b/substrate/core/client/Cargo.toml index f140b2f343..80a3b3d99a 100644 --- a/substrate/core/client/Cargo.toml +++ b/substrate/core/client/Cargo.toml @@ -21,7 +21,7 @@ hash-db = { version = "0.14.0", default-features = false } kvdb = { git = "https://github.com/paritytech/parity-common", optional = true, rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } -runtime-primitives = { package = "sr-primitives", path = "../sr-primitives", default-features = false } +sr-primitives = { path = "../sr-primitives", default-features = false } runtime-version = { package = "sr-version", path = "../sr-version", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } inherents = { package = "substrate-inherents", path = "../inherents", default-features = false } @@ -38,7 +38,7 @@ std = [ "parity-codec/std", "primitives/std", "inherents/std", - "runtime-primitives/std", + "sr-primitives/std", "runtime-version/std", "hash-db/std", "consensus", diff --git a/substrate/core/client/db/Cargo.toml b/substrate/core/client/db/Cargo.toml index 899c85998a..202b21558a 100644 --- a/substrate/core/client/db/Cargo.toml +++ b/substrate/core/client/db/Cargo.toml @@ -14,7 +14,7 @@ kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b031 linked-hash-map = "0.5" hash-db = { version = "0.14.0" } primitives = { package = "substrate-primitives", path = "../../primitives" } -runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" } +sr-primitives = { path = "../../sr-primitives" } client = { package = "substrate-client", path = "../../client" } state-machine = { package = "substrate-state-machine", path = "../../state-machine" } parity-codec = { version = "4.1.1", features = ["derive"] } diff --git a/substrate/core/client/db/src/cache/list_cache.rs b/substrate/core/client/db/src/cache/list_cache.rs index 727375244d..9e54fdbb62 100644 --- a/substrate/core/client/db/src/cache/list_cache.rs +++ b/substrate/core/client/db/src/cache/list_cache.rs @@ -44,7 +44,7 @@ use std::collections::BTreeSet; use log::warn; use client::error::{Error as ClientError, Result as ClientResult}; -use runtime_primitives::traits::{ +use sr_primitives::traits::{ Block as BlockT, NumberFor, Zero, Bounded, CheckedSub }; @@ -544,7 +544,7 @@ pub fn destroy_fork, Tx: Stor /// Blockchain related functions. mod chain { - use runtime_primitives::traits::Header as HeaderT; + use sr_primitives::traits::Header as HeaderT; use super::*; /// Is the block1 connected both ends of the range. @@ -618,8 +618,8 @@ fn read_forks>( #[cfg(test)] pub mod tests { use test_client::runtime::H256; - use runtime_primitives::testing::{Header, Block as RawBlock, ExtrinsicWrapper}; - use runtime_primitives::traits::Header as HeaderT; + use sr_primitives::testing::{Header, Block as RawBlock, ExtrinsicWrapper}; + use sr_primitives::traits::Header as HeaderT; use crate::cache::list_storage::tests::{DummyStorage, FaultyStorage, DummyTransaction}; use super::*; diff --git a/substrate/core/client/db/src/cache/list_entry.rs b/substrate/core/client/db/src/cache/list_entry.rs index 3305b909d2..2ec5f01a44 100644 --- a/substrate/core/client/db/src/cache/list_entry.rs +++ b/substrate/core/client/db/src/cache/list_entry.rs @@ -17,7 +17,7 @@ //! List-cache storage entries. use client::error::Result as ClientResult; -use runtime_primitives::traits::{Block as BlockT, NumberFor}; +use sr_primitives::traits::{Block as BlockT, NumberFor}; use parity_codec::{Encode, Decode}; use crate::cache::{CacheItemT, ComplexBlockId}; diff --git a/substrate/core/client/db/src/cache/list_storage.rs b/substrate/core/client/db/src/cache/list_storage.rs index af0b74066c..3c4a7252f3 100644 --- a/substrate/core/client/db/src/cache/list_storage.rs +++ b/substrate/core/client/db/src/cache/list_storage.rs @@ -22,8 +22,8 @@ use kvdb::{KeyValueDB, DBTransaction}; use client::error::{Error as ClientError, Result as ClientResult}; use parity_codec::{Encode, Decode}; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; use crate::utils::{self, db_err, meta_keys}; use crate::cache::{CacheItemT, ComplexBlockId}; diff --git a/substrate/core/client/db/src/cache/mod.rs b/substrate/core/client/db/src/cache/mod.rs index 1c112c9036..a7632d6aeb 100644 --- a/substrate/core/client/db/src/cache/mod.rs +++ b/substrate/core/client/db/src/cache/mod.rs @@ -24,8 +24,8 @@ use kvdb::{KeyValueDB, DBTransaction}; use client::blockchain::Cache as BlockchainCache; use client::error::Result as ClientResult; use parity_codec::{Encode, Decode}; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero}; +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero}; use consensus_common::well_known_cache_keys::Id as CacheKeyId; use crate::utils::{self, COLUMN_META, db_err}; diff --git a/substrate/core/client/db/src/lib.rs b/substrate/core/client/db/src/lib.rs index e73d3df62c..e2472f1138 100644 --- a/substrate/core/client/db/src/lib.rs +++ b/substrate/core/client/db/src/lib.rs @@ -49,11 +49,11 @@ use trie::{MemoryDB, PrefixedMemoryDB, prefixed_key}; use parking_lot::{Mutex, RwLock}; use primitives::{H256, Blake2Hasher, ChangesTrieConfiguration, convert_hash}; use primitives::storage::well_known_keys; -use runtime_primitives::{ +use sr_primitives::{ generic::{BlockId, DigestItem}, Justification, StorageOverlay, ChildrenStorageOverlay, BuildStorage }; -use runtime_primitives::traits::{ +use sr_primitives::traits::{ Block as BlockT, Header as HeaderT, NumberFor, Zero, One, SaturatedConversion }; use state_machine::backend::Backend as StateBackend; @@ -1427,8 +1427,8 @@ mod tests { use client::backend::Backend as BTrait; use client::blockchain::Backend as BLBTrait; use client::backend::BlockImportOperation as Op; - use runtime_primitives::testing::{Header, Block as RawBlock, ExtrinsicWrapper}; - use runtime_primitives::traits::{Hash, BlakeTwo256}; + use sr_primitives::testing::{Header, Block as RawBlock, ExtrinsicWrapper}; + use sr_primitives::traits::{Hash, BlakeTwo256}; use state_machine::{TrieMut, TrieDBMut, ChangesTrieRootsStorage, ChangesTrieStorage}; use test_client; @@ -1457,7 +1457,7 @@ mod tests { changes: Vec<(Vec, Vec)>, extrinsics_root: H256, ) -> H256 { - use runtime_primitives::testing::Digest; + use sr_primitives::testing::Digest; let (changes_root, changes_trie_update) = prepare_changes(changes); let digest = Digest { diff --git a/substrate/core/client/db/src/light.rs b/substrate/core/client/db/src/light.rs index 95f50ab6f6..3714338fad 100644 --- a/substrate/core/client/db/src/light.rs +++ b/substrate/core/client/db/src/light.rs @@ -31,8 +31,8 @@ use client::error::{Error as ClientError, Result as ClientResult}; use client::light::blockchain::Storage as LightBlockchainStorage; use parity_codec::{Decode, Encode}; use primitives::Blake2Hasher; -use runtime_primitives::generic::{DigestItem, BlockId}; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, Zero, One, NumberFor}; +use sr_primitives::generic::{DigestItem, BlockId}; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, Zero, One, NumberFor}; use consensus_common::well_known_cache_keys; use crate::cache::{DbCacheSync, DbCache, ComplexBlockId, EntryType as CacheEntryType}; use crate::utils::{self, meta_keys, Meta, db_err, read_db, block_id_to_lookup_key, read_meta}; @@ -571,8 +571,8 @@ fn cht_key>(cht_type: u8, block: N) -> ClientResult<[u8; 5]> { #[cfg(test)] pub(crate) mod tests { use client::cht; - use runtime_primitives::generic::DigestItem; - use runtime_primitives::testing::{H256 as Hash, Header, Block as RawBlock, ExtrinsicWrapper}; + use sr_primitives::generic::DigestItem; + use sr_primitives::testing::{H256 as Hash, Header, Block as RawBlock, ExtrinsicWrapper}; use super::*; type Block = RawBlock>; diff --git a/substrate/core/client/db/src/storage_cache.rs b/substrate/core/client/db/src/storage_cache.rs index 7df1472ece..61376bd9bd 100644 --- a/substrate/core/client/db/src/storage_cache.rs +++ b/substrate/core/client/db/src/storage_cache.rs @@ -21,7 +21,7 @@ use std::sync::Arc; use parking_lot::{Mutex, RwLock, RwLockUpgradableReadGuard}; use linked_hash_map::{LinkedHashMap, Entry}; use hash_db::Hasher; -use runtime_primitives::traits::{Block as BlockT, Header}; +use sr_primitives::traits::{Block as BlockT, Header}; use state_machine::{backend::Backend as StateBackend, TrieBackend}; use log::trace; use super::{StorageCollection, ChildStorageCollection}; @@ -105,7 +105,7 @@ impl LRUMap { // TODO assert k v size fit into limit?? to avoid insert remove? match lmap.entry(k) { Entry::Occupied(mut entry) => { - // note that in this case we are not running pure lru as + // note that in this case we are not running pure lru as // it would require to remove first *storage_used_size -= entry.get().estimate_size(); entry.insert(v); @@ -143,7 +143,7 @@ impl LRUMap { } } - + impl Cache { /// Returns the used memory size of the storage cache in bytes. pub fn used_storage_cache_size(&self) -> usize { @@ -563,7 +563,7 @@ impl, B: BlockT> StateBackend for CachingState< #[cfg(test)] mod tests { use super::*; - use runtime_primitives::testing::{H256, Block as RawBlock, ExtrinsicWrapper}; + use sr_primitives::testing::{H256, Block as RawBlock, ExtrinsicWrapper}; use state_machine::backend::InMemory; use primitives::Blake2Hasher; diff --git a/substrate/core/client/db/src/utils.rs b/substrate/core/client/db/src/utils.rs index e0e36c6dbc..a2dd144c89 100644 --- a/substrate/core/client/db/src/utils.rs +++ b/substrate/core/client/db/src/utils.rs @@ -29,8 +29,8 @@ use log::debug; use client; use parity_codec::Decode; use trie::DBValue; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{ +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{ Block as BlockT, Header as HeaderT, Zero, UniqueSaturatedFrom, UniqueSaturatedInto, }; @@ -187,7 +187,7 @@ pub fn block_id_to_lookup_key( id: BlockId ) -> Result>, client::error::Error> where Block: BlockT, - ::runtime_primitives::traits::NumberFor: UniqueSaturatedFrom + UniqueSaturatedInto, + ::sr_primitives::traits::NumberFor: UniqueSaturatedFrom + UniqueSaturatedInto, { let res = match id { BlockId::Number(n) => db.get( @@ -332,7 +332,7 @@ pub fn read_meta(db: &dyn KeyValueDB, col_meta: Option, col_header: #[cfg(test)] mod tests { use super::*; - use runtime_primitives::testing::{Block as RawBlock, ExtrinsicWrapper}; + use sr_primitives::testing::{Block as RawBlock, ExtrinsicWrapper}; type Block = RawBlock>; #[test] diff --git a/substrate/core/client/src/backend.rs b/substrate/core/client/src/backend.rs index 79bc1b475b..24b48c9b86 100644 --- a/substrate/core/client/src/backend.rs +++ b/substrate/core/client/src/backend.rs @@ -19,8 +19,8 @@ use std::collections::HashMap; use crate::error; use primitives::ChangesTrieConfiguration; -use runtime_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenStorageOverlay}; -use runtime_primitives::traits::{Block as BlockT, NumberFor}; +use sr_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenStorageOverlay}; +use sr_primitives::traits::{Block as BlockT, NumberFor}; use state_machine::backend::Backend as StateBackend; use state_machine::ChangesTrieStorage as StateChangesTrieStorage; use consensus::well_known_cache_keys; diff --git a/substrate/core/client/src/block_builder/api.rs b/substrate/core/client/src/block_builder/api.rs index 44663a7094..5bf742a456 100644 --- a/substrate/core/client/src/block_builder/api.rs +++ b/substrate/core/client/src/block_builder/api.rs @@ -16,7 +16,7 @@ //! The runtime api for building blocks. -use runtime_primitives::{traits::Block as BlockT, ApplyResult}; +use sr_primitives::{traits::Block as BlockT, ApplyResult}; use rstd::vec::Vec; use sr_api_macros::decl_runtime_apis; pub use inherents::{InherentData, CheckInherentsResult}; diff --git a/substrate/core/client/src/block_builder/block_builder.rs b/substrate/core/client/src/block_builder/block_builder.rs index 4564c29aae..5e836b6bc2 100644 --- a/substrate/core/client/src/block_builder/block_builder.rs +++ b/substrate/core/client/src/block_builder/block_builder.rs @@ -17,9 +17,9 @@ use super::api::BlockBuilder as BlockBuilderApi; use std::vec::Vec; use parity_codec::Encode; -use runtime_primitives::ApplyOutcome; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{ +use sr_primitives::ApplyOutcome; +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{ Header as HeaderT, Hash, Block as BlockT, One, HashFor, ProvideRuntimeApi, ApiRef, DigestFor, }; use primitives::{H256, ExecutionContext}; diff --git a/substrate/core/client/src/blockchain.rs b/substrate/core/client/src/blockchain.rs index 77c2051138..2bf61df704 100644 --- a/substrate/core/client/src/blockchain.rs +++ b/substrate/core/client/src/blockchain.rs @@ -18,9 +18,9 @@ use std::sync::Arc; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; -use runtime_primitives::generic::BlockId; -use runtime_primitives::Justification; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; +use sr_primitives::generic::BlockId; +use sr_primitives::Justification; use consensus::well_known_cache_keys; use crate::error::{Error, Result}; @@ -196,7 +196,7 @@ pub fn tree_route>( from: BlockId, to: BlockId, ) -> Result> { - use runtime_primitives::traits::Header; + use sr_primitives::traits::Header; let load_header = |id: BlockId| { match backend.header(id) { diff --git a/substrate/core/client/src/call_executor.rs b/substrate/core/client/src/call_executor.rs index c107e6f2bb..1b41cc3aa3 100644 --- a/substrate/core/client/src/call_executor.rs +++ b/substrate/core/client/src/call_executor.rs @@ -16,7 +16,7 @@ use std::{sync::Arc, cmp::Ord, panic::UnwindSafe, result, cell::RefCell, rc::Rc}; use parity_codec::{Encode, Decode}; -use runtime_primitives::{ +use sr_primitives::{ generic::BlockId, traits::Block as BlockT, }; use state_machine::{ diff --git a/substrate/core/client/src/cht.rs b/substrate/core/client/src/cht.rs index fc8920327e..56803a9827 100644 --- a/substrate/core/client/src/cht.rs +++ b/substrate/core/client/src/cht.rs @@ -30,7 +30,7 @@ use parity_codec::Encode; use trie; use primitives::{H256, convert_hash}; -use runtime_primitives::traits::{Header as HeaderT, SimpleArithmetic, Zero, One}; +use sr_primitives::traits::{Header as HeaderT, SimpleArithmetic, Zero, One}; use state_machine::backend::InMemory as InMemoryState; use state_machine::{MemoryDB, TrieBackend, Backend as StateBackend, prove_read_on_trie_backend, read_proof_check, read_proof_check_on_proving_backend}; diff --git a/substrate/core/client/src/client.rs b/substrate/core/client/src/client.rs index 6decdfc9ca..683b07dd70 100644 --- a/substrate/core/client/src/client.rs +++ b/substrate/core/client/src/client.rs @@ -24,7 +24,7 @@ use crate::error::Error; use futures::channel::mpsc; use parking_lot::{Mutex, RwLock}; use primitives::NativeOrEncoded; -use runtime_primitives::{ +use sr_primitives::{ Justification, generic::{BlockId, SignedBlock}, }; @@ -34,13 +34,13 @@ use consensus::{ well_known_cache_keys::Id as CacheKeyId, SelectChain, self, }; -use runtime_primitives::traits::{ +use sr_primitives::traits::{ Block as BlockT, Header as HeaderT, Zero, NumberFor, CurrentHeight, BlockNumberToHash, ApiRef, ProvideRuntimeApi, SaturatedConversion, One, DigestFor, }; -use runtime_primitives::generic::DigestItem; -use runtime_primitives::BuildStorage; +use sr_primitives::generic::DigestItem; +use sr_primitives::BuildStorage; use crate::runtime_api::{ CallRuntimeAt, ConstructRuntimeApi, Core as CoreApi, ProofRecorder, InitializeBlock, @@ -1851,7 +1851,7 @@ pub(crate) mod tests { use std::collections::HashMap; use super::*; use primitives::blake2_256; - use runtime_primitives::DigestItem; + use sr_primitives::DigestItem; use consensus::{BlockOrigin, SelectChain}; use test_client::{ prelude::*, diff --git a/substrate/core/client/src/error.rs b/substrate/core/client/src/error.rs index 2de5a42781..d95263abce 100644 --- a/substrate/core/client/src/error.rs +++ b/substrate/core/client/src/error.rs @@ -18,7 +18,7 @@ use std::{self, error, result}; use state_machine; -use runtime_primitives::ApplyError; +use sr_primitives::ApplyError; use consensus; use derive_more::{Display, From}; diff --git a/substrate/core/client/src/genesis.rs b/substrate/core/client/src/genesis.rs index b577d1c8a7..719661e344 100644 --- a/substrate/core/client/src/genesis.rs +++ b/substrate/core/client/src/genesis.rs @@ -16,7 +16,7 @@ //! Tool for creating the genesis block. -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, Hash as HashT, Zero}; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, Hash as HashT, Zero}; /// Create a genesis block, given the initial storage. pub fn construct_genesis_block< @@ -49,7 +49,7 @@ mod tests { runtime::{Hash, Transfer, Block, BlockNumber, Header, Digest}, AccountKeyring, Sr25519Keyring, }; - use runtime_primitives::traits::BlakeTwo256; + use sr_primitives::traits::BlakeTwo256; use primitives::Blake2Hasher; use hex::*; diff --git a/substrate/core/client/src/in_mem.rs b/substrate/core/client/src/in_mem.rs index 8a229470be..dd56c76a2b 100644 --- a/substrate/core/client/src/in_mem.rs +++ b/substrate/core/client/src/in_mem.rs @@ -20,9 +20,9 @@ use std::collections::HashMap; use std::sync::Arc; use parking_lot::{RwLock, Mutex}; use primitives::{ChangesTrieConfiguration, storage::well_known_keys}; -use runtime_primitives::generic::{BlockId, DigestItem}; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, Zero, NumberFor}; -use runtime_primitives::{Justification, StorageOverlay, ChildrenStorageOverlay}; +use sr_primitives::generic::{BlockId, DigestItem}; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, Zero, NumberFor}; +use sr_primitives::{Justification, StorageOverlay, ChildrenStorageOverlay}; use state_machine::backend::{Backend as StateBackend, InMemory}; use state_machine::{self, InMemoryChangesTrieStorage, ChangesTrieAnchorBlockId}; use hash_db::Hasher; diff --git a/substrate/core/client/src/leaves.rs b/substrate/core/client/src/leaves.rs index b0e49ead80..ed2cde6d5e 100644 --- a/substrate/core/client/src/leaves.rs +++ b/substrate/core/client/src/leaves.rs @@ -19,7 +19,7 @@ use std::collections::BTreeMap; use std::cmp::Reverse; use kvdb::{KeyValueDB, DBTransaction}; -use runtime_primitives::traits::SimpleArithmetic; +use sr_primitives::traits::SimpleArithmetic; use parity_codec::{Encode, Decode}; use crate::error; diff --git a/substrate/core/client/src/light/backend.rs b/substrate/core/client/src/light/backend.rs index 6f6bde2418..4730297656 100644 --- a/substrate/core/client/src/light/backend.rs +++ b/substrate/core/client/src/light/backend.rs @@ -21,9 +21,9 @@ use std::collections::HashMap; use std::sync::{Arc, Weak}; use parking_lot::{RwLock, Mutex}; -use runtime_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenStorageOverlay}; +use sr_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenStorageOverlay}; use state_machine::{Backend as StateBackend, TrieBackend, backend::InMemory as InMemoryState}; -use runtime_primitives::traits::{Block as BlockT, NumberFor, Zero, Header}; +use sr_primitives::traits::{Block as BlockT, NumberFor, Zero, Header}; use crate::in_mem::{self, check_genesis_storage}; use crate::backend::{ AuxStore, Backend as ClientBackend, BlockImportOperation, RemoteBackend, NewBlockState, diff --git a/substrate/core/client/src/light/blockchain.rs b/substrate/core/client/src/light/blockchain.rs index 6bd4c787d5..a2c2fe72ba 100644 --- a/substrate/core/client/src/light/blockchain.rs +++ b/substrate/core/client/src/light/blockchain.rs @@ -20,8 +20,8 @@ use std::{sync::{Weak, Arc}, collections::HashMap}; use parking_lot::Mutex; -use runtime_primitives::{Justification, generic::BlockId}; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero}; +use sr_primitives::{Justification, generic::BlockId}; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero}; use consensus::well_known_cache_keys; use crate::backend::{AuxStore, NewBlockState}; diff --git a/substrate/core/client/src/light/call_executor.rs b/substrate/core/client/src/light/call_executor.rs index f164c17659..5cd630ed79 100644 --- a/substrate/core/client/src/light/call_executor.rs +++ b/substrate/core/client/src/light/call_executor.rs @@ -24,8 +24,8 @@ use std::{ use parity_codec::{Encode, Decode}; use primitives::{offchain, H256, Blake2Hasher, convert_hash, NativeOrEncoded}; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{One, Block as BlockT, Header as HeaderT}; +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{One, Block as BlockT, Header as HeaderT}; use state_machine::{ self, Backend as StateBackend, CodeExecutor, OverlayedChanges, ExecutionStrategy, create_proof_check_backend, diff --git a/substrate/core/client/src/light/fetcher.rs b/substrate/core/client/src/light/fetcher.rs index 5d754a137b..e788b3594b 100644 --- a/substrate/core/client/src/light/fetcher.rs +++ b/substrate/core/client/src/light/fetcher.rs @@ -24,7 +24,7 @@ use std::future::Future; use hash_db::{HashDB, Hasher}; use parity_codec::{Decode, Encode}; use primitives::{ChangesTrieConfiguration, convert_hash}; -use runtime_primitives::traits::{ +use sr_primitives::traits::{ Block as BlockT, Header as HeaderT, Hash, HashFor, NumberFor, SimpleArithmetic, CheckedConversion, }; @@ -502,7 +502,7 @@ pub mod tests { use crate::light::blockchain::tests::{DummyStorage, DummyBlockchain}; use primitives::{blake2_256, Blake2Hasher, H256}; use primitives::storage::{well_known_keys, StorageKey}; - use runtime_primitives::generic::BlockId; + use sr_primitives::generic::BlockId; use state_machine::Backend; use super::*; diff --git a/substrate/core/client/src/light/mod.rs b/substrate/core/client/src/light/mod.rs index 2cdcaf4990..69ba4d9f73 100644 --- a/substrate/core/client/src/light/mod.rs +++ b/substrate/core/client/src/light/mod.rs @@ -25,8 +25,8 @@ use std::sync::Arc; use executor::RuntimeInfo; use primitives::{H256, Blake2Hasher}; -use runtime_primitives::BuildStorage; -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::BuildStorage; +use sr_primitives::traits::Block as BlockT; use state_machine::CodeExecutor; use crate::call_executor::LocalCallExecutor; diff --git a/substrate/core/client/src/notifications.rs b/substrate/core/client/src/notifications.rs index bfd97df95c..0ddc4c72cd 100644 --- a/substrate/core/client/src/notifications.rs +++ b/substrate/core/client/src/notifications.rs @@ -24,7 +24,7 @@ use std::{ use fnv::{FnvHashSet, FnvHashMap}; use futures::channel::mpsc; use primitives::storage::{StorageKey, StorageData}; -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::traits::Block as BlockT; /// Storage change set #[derive(Debug)] @@ -307,7 +307,7 @@ impl StorageNotifications { #[cfg(test)] mod tests { - use runtime_primitives::testing::{H256 as Hash, Block as RawBlock, ExtrinsicWrapper}; + use sr_primitives::testing::{H256 as Hash, Block as RawBlock, ExtrinsicWrapper}; use super::*; use std::iter::{empty, Empty}; diff --git a/substrate/core/client/src/runtime_api.rs b/substrate/core/client/src/runtime_api.rs index d14907f162..890e265878 100644 --- a/substrate/core/client/src/runtime_api.rs +++ b/substrate/core/client/src/runtime_api.rs @@ -23,7 +23,7 @@ pub use state_machine::OverlayedChanges; #[cfg(feature = "std")] pub use primitives::NativeOrEncoded; #[doc(hidden)] -pub use runtime_primitives::{ +pub use sr_primitives::{ traits::{ Block as BlockT, GetNodeBlockType, GetRuntimeBlockType, Header as HeaderT, ApiRef, RuntimeApiInfo, Hash as HashT, diff --git a/substrate/core/consensus/aura/Cargo.toml b/substrate/core/consensus/aura/Cargo.toml index add7d8b217..e7a5007e22 100644 --- a/substrate/core/consensus/aura/Cargo.toml +++ b/substrate/core/consensus/aura/Cargo.toml @@ -18,7 +18,7 @@ srml-aura = { path = "../../../srml/aura" } client = { package = "substrate-client", path = "../../client" } substrate-telemetry = { path = "../../telemetry" } consensus_common = { package = "substrate-consensus-common", path = "../common" } -runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" } +sr-primitives = { path = "../../sr-primitives" } futures-preview = { version = "0.3.0-alpha.17", features = ["compat"] } futures01 = { package = "futures", version = "0.1" } futures-timer = "0.2.1" diff --git a/substrate/core/consensus/aura/primitives/Cargo.toml b/substrate/core/consensus/aura/primitives/Cargo.toml index bc51c90d8c..cbebd10a4d 100644 --- a/substrate/core/consensus/aura/primitives/Cargo.toml +++ b/substrate/core/consensus/aura/primitives/Cargo.toml @@ -8,16 +8,16 @@ edition = "2018" [dependencies] parity-codec = { version = "4.1.1", default-features = false } substrate-client = { path = "../../../client", default-features = false } -substrate-primitives = { path = "../../../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../primitives", default-features = false } rstd = { package = "sr-std", path = "../../../sr-std", default-features = false } -runtime_primitives = { package = "sr-primitives", path = "../../../sr-primitives", default-features = false } +sr-primitives = { path = "../../../sr-primitives", default-features = false } [features] default = ["std"] std = [ "rstd/std", "parity-codec/std", - "runtime_primitives/std", + "sr-primitives/std", "substrate-client/std", - "substrate-primitives/std", + "primitives/std", ] diff --git a/substrate/core/consensus/aura/primitives/src/lib.rs b/substrate/core/consensus/aura/primitives/src/lib.rs index 47b1399a67..10c3c96e4f 100644 --- a/substrate/core/consensus/aura/primitives/src/lib.rs +++ b/substrate/core/consensus/aura/primitives/src/lib.rs @@ -21,7 +21,7 @@ use parity_codec::{Encode, Decode, Codec}; use substrate_client::decl_runtime_apis; use rstd::vec::Vec; -use runtime_primitives::ConsensusEngineId; +use sr_primitives::ConsensusEngineId; /// The `ConsensusEngineId` of AuRa. pub const AURA_ENGINE_ID: ConsensusEngineId = [b'a', b'u', b'r', b'a']; diff --git a/substrate/core/consensus/aura/src/digest.rs b/substrate/core/consensus/aura/src/digest.rs index 1fe79324f4..82fd0cf655 100644 --- a/substrate/core/consensus/aura/src/digest.rs +++ b/substrate/core/consensus/aura/src/digest.rs @@ -21,7 +21,7 @@ use primitives::Pair; use aura_primitives::AURA_ENGINE_ID; -use runtime_primitives::generic::{DigestItem, OpaqueDigestItemId}; +use sr_primitives::generic::{DigestItem, OpaqueDigestItemId}; use parity_codec::{Encode, Codec}; use std::fmt::Debug; diff --git a/substrate/core/consensus/aura/src/lib.rs b/substrate/core/consensus/aura/src/lib.rs index 1dd644b751..a08dcdf1d4 100644 --- a/substrate/core/consensus/aura/src/lib.rs +++ b/substrate/core/consensus/aura/src/lib.rs @@ -46,8 +46,8 @@ use client::{ backend::AuxStore, }; -use runtime_primitives::{generic::{self, BlockId, OpaqueDigestItemId}, Justification}; -use runtime_primitives::traits::{Block as BlockT, Header, DigestItemFor, ProvideRuntimeApi, Zero, Member}; +use sr_primitives::{generic::{self, BlockId, OpaqueDigestItemId}, Justification}; +use sr_primitives::traits::{Block as BlockT, Header, DigestItemFor, ProvideRuntimeApi, Zero, Member}; use primitives::Pair; use inherents::{InherentDataProviders, InherentData}; @@ -716,7 +716,7 @@ mod tests { use consensus_common::NoNetwork as DummyOracle; use network::test::*; use network::test::{Block as TestBlock, PeersClient, PeersFullClient}; - use runtime_primitives::traits::{Block as BlockT, DigestFor}; + use sr_primitives::traits::{Block as BlockT, DigestFor}; use network::config::ProtocolConfig; use parking_lot::Mutex; use tokio::runtime::current_thread; diff --git a/substrate/core/consensus/babe/Cargo.toml b/substrate/core/consensus/babe/Cargo.toml index deb716a7ff..331c85dda8 100644 --- a/substrate/core/consensus/babe/Cargo.toml +++ b/substrate/core/consensus/babe/Cargo.toml @@ -21,7 +21,7 @@ srml-babe = { path = "../../../srml/babe" } client = { package = "substrate-client", path = "../../client" } consensus_common = { package = "substrate-consensus-common", path = "../common" } slots = { package = "substrate-consensus-slots", path = "../slots" } -runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" } +sr-primitives = { path = "../../sr-primitives" } fork-tree = { path = "../../utils/fork-tree" } futures-preview = { version = "0.3.0-alpha.17", features = ["compat"] } futures01 = { package = "futures", version = "0.1" } diff --git a/substrate/core/consensus/babe/primitives/Cargo.toml b/substrate/core/consensus/babe/primitives/Cargo.toml index 6eb0a251e1..2c6ba886f4 100644 --- a/substrate/core/consensus/babe/primitives/Cargo.toml +++ b/substrate/core/consensus/babe/primitives/Cargo.toml @@ -8,8 +8,8 @@ edition = "2018" [dependencies] substrate-client = { path = "../../../client", default-features = false } rstd = { package = "sr-std", path = "../../../sr-std", default-features = false } -runtime_primitives = { package = "sr-primitives", path = "../../../sr-primitives", default-features = false } -substrate-primitives = { path = "../../../primitives", default-features = false } +sr-primitives = { path = "../../../sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../../primitives", default-features = false } slots = { package = "substrate-consensus-slots", path = "../../slots", optional = true } parity-codec = { version = "4.1.1", default-features = false } schnorrkel = { version = "0.1.1", optional = true } @@ -18,7 +18,7 @@ schnorrkel = { version = "0.1.1", optional = true } default = ["std"] std = [ "rstd/std", - "runtime_primitives/std", + "sr-primitives/std", "substrate-client/std", "parity-codec/std", "schnorrkel", diff --git a/substrate/core/consensus/babe/primitives/src/digest.rs b/substrate/core/consensus/babe/primitives/src/digest.rs index f39cc96287..6266b828fb 100644 --- a/substrate/core/consensus/babe/primitives/src/digest.rs +++ b/substrate/core/consensus/babe/primitives/src/digest.rs @@ -17,14 +17,14 @@ //! Private implementation details of BABE digests. #[cfg(feature = "std")] -use substrate_primitives::sr25519::Signature; +use primitives::sr25519::Signature; #[cfg(feature = "std")] use super::{BABE_ENGINE_ID, Epoch}; #[cfg(not(feature = "std"))] use super::{VRF_OUTPUT_LENGTH, VRF_PROOF_LENGTH}; use super::SlotNumber; #[cfg(feature = "std")] -use runtime_primitives::{DigestItem, generic::OpaqueDigestItemId}; +use sr_primitives::{DigestItem, generic::OpaqueDigestItemId}; #[cfg(feature = "std")] use std::fmt::Debug; use parity_codec::{Decode, Encode}; diff --git a/substrate/core/consensus/babe/primitives/src/lib.rs b/substrate/core/consensus/babe/primitives/src/lib.rs index b6e964d27f..0e1cc217ab 100644 --- a/substrate/core/consensus/babe/primitives/src/lib.rs +++ b/substrate/core/consensus/babe/primitives/src/lib.rs @@ -23,8 +23,8 @@ mod digest; use parity_codec::{Encode, Decode}; use rstd::vec::Vec; -use runtime_primitives::ConsensusEngineId; -use substrate_primitives::sr25519; +use sr_primitives::ConsensusEngineId; +use primitives::sr25519; use substrate_client::decl_runtime_apis; #[cfg(feature = "std")] diff --git a/substrate/core/consensus/babe/src/aux_schema.rs b/substrate/core/consensus/babe/src/aux_schema.rs index 50d2a727f1..91764839fb 100644 --- a/substrate/core/consensus/babe/src/aux_schema.rs +++ b/substrate/core/consensus/babe/src/aux_schema.rs @@ -21,7 +21,7 @@ use parity_codec::{Decode, Encode}; use client::backend::AuxStore; use client::error::{Result as ClientResult, Error as ClientError}; -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::traits::Block as BlockT; use super::{EpochChanges, SharedEpochChanges}; diff --git a/substrate/core/consensus/babe/src/lib.rs b/substrate/core/consensus/babe/src/lib.rs index 4f5f9856ff..4a4261b8dd 100644 --- a/substrate/core/consensus/babe/src/lib.rs +++ b/substrate/core/consensus/babe/src/lib.rs @@ -27,8 +27,8 @@ use consensus_common::import_queue::{ BoxJustificationImport, BoxFinalityProofImport, }; use consensus_common::well_known_cache_keys::Id as CacheKeyId; -use runtime_primitives::{generic, generic::{BlockId, OpaqueDigestItemId}, Justification}; -use runtime_primitives::traits::{ +use sr_primitives::{generic, generic::{BlockId, OpaqueDigestItemId}, Justification}; +use sr_primitives::traits::{ Block as BlockT, Header, DigestItemFor, NumberFor, ProvideRuntimeApi, SimpleBitOps, Zero, }; diff --git a/substrate/core/consensus/babe/src/tests.rs b/substrate/core/consensus/babe/src/tests.rs index 700ef690f3..f9a2360210 100644 --- a/substrate/core/consensus/babe/src/tests.rs +++ b/substrate/core/consensus/babe/src/tests.rs @@ -25,7 +25,7 @@ use client::{LongestChain, block_builder::BlockBuilder}; use consensus_common::NoNetwork as DummyOracle; use network::test::*; use network::test::{Block as TestBlock, PeersClient}; -use runtime_primitives::traits::{Block as BlockT, DigestFor}; +use sr_primitives::traits::{Block as BlockT, DigestFor}; use network::config::ProtocolConfig; use tokio::runtime::current_thread; use keyring::sr25519::Keyring; diff --git a/substrate/core/consensus/common/Cargo.toml b/substrate/core/consensus/common/Cargo.toml index bb0970f8a2..c4731ce2a5 100644 --- a/substrate/core/consensus/common/Cargo.toml +++ b/substrate/core/consensus/common/Cargo.toml @@ -15,7 +15,7 @@ futures-preview = "0.3.0-alpha.17" futures-timer = "0.2.1" rstd = { package = "sr-std", path = "../../sr-std" } runtime_version = { package = "sr-version", path = "../../sr-version" } -runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" } +sr-primitives = { path = "../../sr-primitives" } parity-codec = { version = "4.1.1", features = ["derive"] } parking_lot = "0.8.0" diff --git a/substrate/core/consensus/common/src/block_import.rs b/substrate/core/consensus/common/src/block_import.rs index 9293eda308..722bf1caed 100644 --- a/substrate/core/consensus/common/src/block_import.rs +++ b/substrate/core/consensus/common/src/block_import.rs @@ -16,8 +16,8 @@ //! Block import helpers. -use runtime_primitives::traits::{Block as BlockT, DigestItemFor, Header as HeaderT, NumberFor}; -use runtime_primitives::Justification; +use sr_primitives::traits::{Block as BlockT, DigestItemFor, Header as HeaderT, NumberFor}; +use sr_primitives::Justification; use std::borrow::Cow; use std::collections::HashMap; use std::sync::Arc; diff --git a/substrate/core/consensus/common/src/evaluation.rs b/substrate/core/consensus/common/src/evaluation.rs index ed7515a419..940728bc83 100644 --- a/substrate/core/consensus/common/src/evaluation.rs +++ b/substrate/core/consensus/common/src/evaluation.rs @@ -19,7 +19,7 @@ use super::MAX_BLOCK_SIZE; use parity_codec::Encode; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, One, CheckedConversion}; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, One, CheckedConversion}; // This is just a best effort to encode the number. None indicated that it's too big to encode // in a u128. diff --git a/substrate/core/consensus/common/src/import_queue.rs b/substrate/core/consensus/common/src/import_queue.rs index 085f1e4177..99ca6e7ad7 100644 --- a/substrate/core/consensus/common/src/import_queue.rs +++ b/substrate/core/consensus/common/src/import_queue.rs @@ -26,7 +26,7 @@ //! queues to be instantiated simply. use std::{sync::Arc, collections::HashMap}; -use runtime_primitives::{Justification, traits::{Block as BlockT, Header as _, NumberFor}}; +use sr_primitives::{Justification, traits::{Block as BlockT, Header as _, NumberFor}}; use crate::{error::Error as ConsensusError, well_known_cache_keys::Id as CacheKeyId}; use crate::block_import::{ BlockImport, BlockOrigin, BlockImportParams, ImportedAux, JustificationImport, ImportResult, diff --git a/substrate/core/consensus/common/src/import_queue/basic_queue.rs b/substrate/core/consensus/common/src/import_queue/basic_queue.rs index d94c3a383c..851662dbc6 100644 --- a/substrate/core/consensus/common/src/import_queue/basic_queue.rs +++ b/substrate/core/consensus/common/src/import_queue/basic_queue.rs @@ -17,7 +17,7 @@ use std::{mem, pin::Pin, sync::Arc, time::Duration}; use futures::{prelude::*, channel::mpsc, task::SpawnExt as _, task::Context, task::Poll}; use futures_timer::Delay; -use runtime_primitives::{Justification, traits::{Block as BlockT, Header as HeaderT, NumberFor}}; +use sr_primitives::{Justification, traits::{Block as BlockT, Header as HeaderT, NumberFor}}; use crate::block_import::BlockOrigin; use crate::import_queue::{ diff --git a/substrate/core/consensus/common/src/import_queue/buffered_link.rs b/substrate/core/consensus/common/src/import_queue/buffered_link.rs index 90921bd1ea..b88f1bfd1e 100644 --- a/substrate/core/consensus/common/src/import_queue/buffered_link.rs +++ b/substrate/core/consensus/common/src/import_queue/buffered_link.rs @@ -38,7 +38,7 @@ //! use futures::{prelude::*, channel::mpsc}; -use runtime_primitives::traits::{Block as BlockT, NumberFor}; +use sr_primitives::traits::{Block as BlockT, NumberFor}; use std::{pin::Pin, task::Context, task::Poll}; use crate::import_queue::{Origin, Link, BlockImportResult, BlockImportError}; diff --git a/substrate/core/consensus/common/src/lib.rs b/substrate/core/consensus/common/src/lib.rs index 53816752b1..3fd0a0c694 100644 --- a/substrate/core/consensus/common/src/lib.rs +++ b/substrate/core/consensus/common/src/lib.rs @@ -31,7 +31,7 @@ use std::sync::Arc; use std::time::Duration; -use runtime_primitives::traits::{Block as BlockT, DigestFor}; +use sr_primitives::traits::{Block as BlockT, DigestFor}; use futures::prelude::*; pub use inherents::InherentData; diff --git a/substrate/core/consensus/common/src/select_chain.rs b/substrate/core/consensus/common/src/select_chain.rs index 9ab21cba13..cae28656a1 100644 --- a/substrate/core/consensus/common/src/select_chain.rs +++ b/substrate/core/consensus/common/src/select_chain.rs @@ -15,7 +15,7 @@ // along with Substrate Consensus Common. If not, see . use crate::error::Error; -use runtime_primitives::traits::{Block as BlockT, NumberFor}; +use sr_primitives::traits::{Block as BlockT, NumberFor}; /// The SelectChain trait defines the strategy upon which the head is chosen diff --git a/substrate/core/consensus/rhd/Cargo.toml b/substrate/core/consensus/rhd/Cargo.toml index 7eda2d6904..b973e02c60 100644 --- a/substrate/core/consensus/rhd/Cargo.toml +++ b/substrate/core/consensus/rhd/Cargo.toml @@ -15,7 +15,7 @@ client = { package = "substrate-client", path = "../../client" } transaction_pool = { package = "substrate-transaction-pool", path = "../../transaction-pool" } runtime_support = { package = "srml-support", path = "../../../srml/support" } srml-system = { path = "../../../srml/system" } -runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" } +sr-primitives = { path = "../../sr-primitives" } runtime_version = { package = "sr-version", path = "../../sr-version" } runtime_io = { package = "sr-io", path = "../../sr-io" } tokio = "0.1.7" @@ -32,6 +32,6 @@ default = ["std"] std = [ "primitives/std", "runtime_support/std", - "runtime_primitives/std", + "sr-primitives/std", "runtime_version/std", ] diff --git a/substrate/core/consensus/rhd/src/lib.rs b/substrate/core/consensus/rhd/src/lib.rs index 281f497cbc..94e25dfc91 100644 --- a/substrate/core/consensus/rhd/src/lib.rs +++ b/substrate/core/consensus/rhd/src/lib.rs @@ -46,13 +46,13 @@ use consensus::error::{ErrorKind as CommonErrorKind}; use consensus::{Authorities, BlockImport, Environment, Proposer as BaseProposer}; use client::{Client as SubstrateClient, CallExecutor}; use client::runtime_api::{Core, BlockBuilder as BlockBuilderAPI, OldTxQueue, BlockBuilderError}; -use runtime_primitives::generic::{BlockId, Era, ImportResult, BlockImportParams, BlockOrigin}; -use runtime_primitives::traits::{Block, Header}; -use runtime_primitives::traits::{ +use sr_primitives::generic::{BlockId, Era, ImportResult, BlockImportParams, BlockOrigin}; +use sr_primitives::traits::{Block, Header}; +use sr_primitives::traits::{ Block as BlockT, Hash as HashT, Header as HeaderT, BlockNumberToHash, SaturatedConversion }; -use runtime_primitives::Justification; +use sr_primitives::Justification; use primitives::{AuthorityId, ed25519, Blake2Hasher, ed25519::LocalizedSignature}; use srml_system::Trait as SystemT; @@ -982,7 +982,7 @@ impl consensus::Environment<::Block> for ProposerFac authorities: &[AuthorityId], sign_with: Arc, ) -> Result { - use runtime_primitives::traits::Hash as HashT; + use sr_primitives::traits::Hash as HashT; let parent_hash = parent_header.hash(); let id = BlockId::hash(parent_hash); @@ -1061,7 +1061,7 @@ impl BaseProposer<::Block> for Proposer where type Evaluate = Box>; fn propose(&self) -> Self::Create { - use runtime_primitives::traits::BlakeTwo256; + use sr_primitives::traits::BlakeTwo256; const MAX_VOTE_OFFLINE_SECONDS: Duration = Duration::from_secs(60); @@ -1237,7 +1237,7 @@ impl LocalProposer<::Block> for Proposer where _misbehavior: Vec<(AuthorityId, Misbehavior<<::Block as BlockT>::Hash>)> ) { use rhododendron::Misbehavior as GenericMisbehavior; - use runtime_primitives::bft::{MisbehaviorKind, MisbehaviorReport}; + use sr_primitives::bft::{MisbehaviorKind, MisbehaviorReport}; use node_runtime::{Call, UncheckedExtrinsic, ConsensusCall}; let mut next_index = { @@ -1329,7 +1329,7 @@ mod tests { use std::collections::HashSet; use std::marker::PhantomData; - use runtime_primitives::testing::{Block as GenericTestBlock, Header as TestHeader}; + use sr_primitives::testing::{Block as GenericTestBlock, Header as TestHeader}; use primitives::H256; use keyring::Ed25519Keyring; diff --git a/substrate/core/consensus/rhd/src/misbehaviour_check.rs b/substrate/core/consensus/rhd/src/misbehaviour_check.rs index a475f5d1ef..e40311c14f 100644 --- a/substrate/core/consensus/rhd/src/misbehaviour_check.rs +++ b/substrate/core/consensus/rhd/src/misbehaviour_check.rs @@ -77,7 +77,7 @@ mod tests { use keyring::Ed25519Keyring; use rhododendron; - use runtime_primitives::testing::{H256, Block as RawBlock}; + use sr_primitives::testing::{H256, Block as RawBlock}; type Block = RawBlock; diff --git a/substrate/core/consensus/rhd/src/service.rs b/substrate/core/consensus/rhd/src/service.rs index f59393c530..641a97fe06 100644 --- a/substrate/core/consensus/rhd/src/service.rs +++ b/substrate/core/consensus/rhd/src/service.rs @@ -25,7 +25,7 @@ use std::sync::Arc; use client::{BlockchainEvents, BlockBody}; use futures::prelude::*; use transaction_pool::txpool::{Pool as TransactionPool, ChainApi as PoolChainApi}; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, BlockNumberToHash}; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, BlockNumberToHash}; use tokio::executor::current_thread::TaskExecutor as LocalThreadHandle; use tokio::runtime::TaskExecutor as ThreadPoolHandle; diff --git a/substrate/core/consensus/slots/Cargo.toml b/substrate/core/consensus/slots/Cargo.toml index 29c11f7533..8d73c44b2b 100644 --- a/substrate/core/consensus/slots/Cargo.toml +++ b/substrate/core/consensus/slots/Cargo.toml @@ -9,7 +9,7 @@ edition = "2018" codec = { package = "parity-codec", version = "4.1.1" } client = { package = "substrate-client", path = "../../client" } primitives = { package = "substrate-primitives", path = "../../primitives" } -runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" } +sr-primitives = { path = "../../sr-primitives" } consensus_common = { package = "substrate-consensus-common", path = "../common" } inherents = { package = "substrate-inherents", path = "../../inherents" } futures-preview = "0.3.0-alpha.17" diff --git a/substrate/core/consensus/slots/src/aux_schema.rs b/substrate/core/consensus/slots/src/aux_schema.rs index 1af8b2da53..193c9f9b9d 100644 --- a/substrate/core/consensus/slots/src/aux_schema.rs +++ b/substrate/core/consensus/slots/src/aux_schema.rs @@ -19,7 +19,7 @@ use codec::{Encode, Decode}; use client::backend::AuxStore; use client::error::{Result as ClientResult, Error as ClientError}; -use runtime_primitives::traits::Header; +use sr_primitives::traits::Header; const SLOT_HEADER_MAP_KEY: &[u8] = b"slot_header_map"; const SLOT_HEADER_START: &[u8] = b"slot_header_start"; @@ -153,7 +153,7 @@ pub fn check_equivocation( mod test { use primitives::{sr25519, Pair}; use primitives::hash::H256; - use runtime_primitives::testing::{Header as HeaderTest, Digest as DigestTest}; + use sr_primitives::testing::{Header as HeaderTest, Digest as DigestTest}; use test_client; use super::{MAX_SLOT_CAPACITY, PRUNING_BOUND, check_equivocation}; diff --git a/substrate/core/consensus/slots/src/lib.rs b/substrate/core/consensus/slots/src/lib.rs index 4cea9d82bf..854e9c8d8b 100644 --- a/substrate/core/consensus/slots/src/lib.rs +++ b/substrate/core/consensus/slots/src/lib.rs @@ -35,8 +35,8 @@ use consensus_common::{SyncOracle, SelectChain}; use futures::{prelude::*, future::{self, Either}, task::Poll}; use inherents::{InherentData, InherentDataProviders}; use log::{debug, error, info, warn}; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{ApiRef, Block as BlockT, ProvideRuntimeApi}; +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{ApiRef, Block as BlockT, ProvideRuntimeApi}; use std::{fmt::Debug, ops::Deref, panic, pin::Pin}; /// A worker that should be invoked at every new slot. @@ -208,7 +208,7 @@ impl SlotDuration { .into() }), None => { - use runtime_primitives::traits::Zero; + use sr_primitives::traits::Zero; let genesis_slot_duration = cb(client.runtime_api(), &BlockId::number(Zero::zero()))?; diff --git a/substrate/core/executor/runtime-test/Cargo.toml b/substrate/core/executor/runtime-test/Cargo.toml index 26bf2f71bd..28a0ed2b87 100644 --- a/substrate/core/executor/runtime-test/Cargo.toml +++ b/substrate/core/executor/runtime-test/Cargo.toml @@ -9,7 +9,7 @@ build = "build.rs" rstd = { package = "sr-std", path = "../../sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../sr-io", default-features = false } sandbox = { package = "sr-sandbox", path = "../../sr-sandbox", default-features = false } -substrate-primitives = { path = "../../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives", default-features = false } [build-dependencies] wasm-builder-runner = { package = "substrate-wasm-builder-runner", version = "1.0.2", path = "../../utils/wasm-builder-runner" } diff --git a/substrate/core/executor/runtime-test/src/lib.rs b/substrate/core/executor/runtime-test/src/lib.rs index 6d4e5ccb55..4c68d449f2 100644 --- a/substrate/core/executor/runtime-test/src/lib.rs +++ b/substrate/core/executor/runtime-test/src/lib.rs @@ -93,7 +93,7 @@ impl_stubs!( [sr25519_verify(&sig, &msg[..], &pubkey) as u8].to_vec() }, test_enumerated_trie_root => |_| { - enumerated_trie_root::( + enumerated_trie_root::( &[ &b"zero"[..], &b"one"[..], @@ -138,7 +138,7 @@ impl_stubs!( [code].to_vec() }, test_offchain_local_storage => |_| { - let kind = substrate_primitives::offchain::StorageKind::PERSISTENT; + let kind = primitives::offchain::StorageKind::PERSISTENT; assert_eq!(runtime_io::local_storage_get(kind, b"test"), None); runtime_io::local_storage_set(kind, b"test", b"asd"); assert_eq!(runtime_io::local_storage_get(kind, b"test"), Some(b"asd".to_vec())); @@ -150,7 +150,7 @@ impl_stubs!( [0].to_vec() }, test_offchain_local_storage_with_none => |_| { - let kind = substrate_primitives::offchain::StorageKind::PERSISTENT; + let kind = primitives::offchain::StorageKind::PERSISTENT; assert_eq!(runtime_io::local_storage_get(kind, b"test"), None); let res = runtime_io::local_storage_compare_and_set(kind, b"test", None, b"value"); @@ -160,7 +160,7 @@ impl_stubs!( [0].to_vec() }, test_offchain_http => |_| { - use substrate_primitives::offchain::HttpRequestStatus; + use primitives::offchain::HttpRequestStatus; let run = || -> Option<()> { let id = runtime_io::http_request_start("POST", "http://localhost:12345", &[]).ok()?; runtime_io::http_request_add_header(id, "X-Auth", "test").ok()?; diff --git a/substrate/core/finality-grandpa/Cargo.toml b/substrate/core/finality-grandpa/Cargo.toml index 3cbb56df81..8477f75edd 100644 --- a/substrate/core/finality-grandpa/Cargo.toml +++ b/substrate/core/finality-grandpa/Cargo.toml @@ -14,9 +14,9 @@ tokio-executor = "0.1.7" tokio-timer = "0.2.11" rand = "0.6" parity-codec = { version = "4.1.1", features = ["derive"] } -runtime_primitives = { package = "sr-primitives", path = "../sr-primitives" } +sr-primitives = { path = "../sr-primitives" } consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" } -substrate-primitives = { path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../primitives" } substrate-telemetry = { path = "../telemetry" } serde_json = "1.0" client = { package = "substrate-client", path = "../client" } diff --git a/substrate/core/finality-grandpa/primitives/Cargo.toml b/substrate/core/finality-grandpa/primitives/Cargo.toml index 4f3b469ca8..75e6b5f608 100644 --- a/substrate/core/finality-grandpa/primitives/Cargo.toml +++ b/substrate/core/finality-grandpa/primitives/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] client = { package = "substrate-client", path = "../../client", default-features = false } -substrate-primitives = { path = "../../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../primitives", default-features = false } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } sr-primitives = { path = "../../sr-primitives", default-features = false } rstd = { package = "sr-std", path = "../../sr-std", default-features = false } @@ -15,7 +15,7 @@ serde = { version = "1.0", optional = true, features = ["derive"] } [features] default = ["std"] std = [ - "substrate-primitives/std", + "primitives/std", "client/std", "parity-codec/std", "sr-primitives/std", diff --git a/substrate/core/finality-grandpa/primitives/src/lib.rs b/substrate/core/finality-grandpa/primitives/src/lib.rs index 7752782025..b60acffc6c 100644 --- a/substrate/core/finality-grandpa/primitives/src/lib.rs +++ b/substrate/core/finality-grandpa/primitives/src/lib.rs @@ -30,13 +30,13 @@ use rstd::vec::Vec; /// The grandpa crypto scheme defined via the keypair type. #[cfg(feature = "std")] -pub type AuthorityPair = substrate_primitives::ed25519::Pair; +pub type AuthorityPair = primitives::ed25519::Pair; /// Identity of a Grandpa authority. -pub type AuthorityId = substrate_primitives::ed25519::Public; +pub type AuthorityId = primitives::ed25519::Public; /// Signature for a Grandpa authority. -pub type AuthoritySignature = substrate_primitives::ed25519::Signature; +pub type AuthoritySignature = primitives::ed25519::Signature; /// The `ConsensusEngineId` of GRANDPA. pub const GRANDPA_ENGINE_ID: ConsensusEngineId = *b"FRNK"; diff --git a/substrate/core/finality-grandpa/src/aux_schema.rs b/substrate/core/finality-grandpa/src/aux_schema.rs index f3939f4650..528a221c35 100644 --- a/substrate/core/finality-grandpa/src/aux_schema.rs +++ b/substrate/core/finality-grandpa/src/aux_schema.rs @@ -23,7 +23,7 @@ use client::backend::AuxStore; use client::error::{Result as ClientResult, Error as ClientError}; use fork_tree::ForkTree; use grandpa::round::State as RoundState; -use runtime_primitives::traits::{Block as BlockT, NumberFor}; +use sr_primitives::traits::{Block as BlockT, NumberFor}; use log::{info, warn}; use substrate_telemetry::{telemetry, CONSENSUS_INFO}; use fg_primitives::AuthorityId; @@ -456,7 +456,7 @@ pub(crate) fn load_authorities(backend: &B) #[cfg(test)] mod test { - use substrate_primitives::H256; + use primitives::H256; use test_client; use super::*; diff --git a/substrate/core/finality-grandpa/src/communication/gossip.rs b/substrate/core/finality-grandpa/src/communication/gossip.rs index dfaa96628f..3d14381e72 100644 --- a/substrate/core/finality-grandpa/src/communication/gossip.rs +++ b/substrate/core/finality-grandpa/src/communication/gossip.rs @@ -82,7 +82,7 @@ //! //! We only send polite messages to peers, -use runtime_primitives::traits::{NumberFor, Block as BlockT, Zero}; +use sr_primitives::traits::{NumberFor, Block as BlockT, Zero}; use network::consensus_gossip::{self as network_gossip, MessageIntent, ValidatorContext}; use network::{config::Roles, PeerId}; use parity_codec::{Encode, Decode}; @@ -1249,7 +1249,7 @@ mod tests { use crate::authorities::AuthoritySet; use crate::environment::{CompletedRound, CompletedRounds, HasVoted, VoterSetState}; use grandpa::round::State as RoundState; - use substrate_primitives::H256; + use primitives::H256; let state = RoundState::genesis((H256::zero(), 0)); let base = state.prevote_ghost.unwrap(); diff --git a/substrate/core/finality-grandpa/src/communication/mod.rs b/substrate/core/finality-grandpa/src/communication/mod.rs index 4707dede78..e9be187eac 100644 --- a/substrate/core/finality-grandpa/src/communication/mod.rs +++ b/substrate/core/finality-grandpa/src/communication/mod.rs @@ -36,9 +36,9 @@ use futures::sync::{oneshot, mpsc}; use log::{debug, trace}; use tokio_executor::Executor; use parity_codec::{Encode, Decode}; -use substrate_primitives::{ed25519, Pair}; +use primitives::{ed25519, Pair}; use substrate_telemetry::{telemetry, CONSENSUS_DEBUG, CONSENSUS_INFO}; -use runtime_primitives::traits::{Block as BlockT, Hash as HashT, Header as HeaderT}; +use sr_primitives::traits::{Block as BlockT, Hash as HashT, Header as HeaderT}; use network::{consensus_gossip as network_gossip, NetworkService}; use network_gossip::ConsensusMessage; @@ -50,7 +50,7 @@ use crate::environment::HasVoted; use gossip::{ GossipMessage, FullCatchUpMessage, FullCommitMessage, VoteOrPrecommitMessage, GossipValidator }; -use substrate_primitives::ed25519::{Public as AuthorityId, Signature as AuthoritySignature}; +use primitives::ed25519::{Public as AuthorityId, Signature as AuthoritySignature}; pub mod gossip; mod periodic; diff --git a/substrate/core/finality-grandpa/src/communication/periodic.rs b/substrate/core/finality-grandpa/src/communication/periodic.rs index 8490ff2f79..cae42d0dc7 100644 --- a/substrate/core/finality-grandpa/src/communication/periodic.rs +++ b/substrate/core/finality-grandpa/src/communication/periodic.rs @@ -19,7 +19,7 @@ use super::{gossip::{NeighborPacket, GossipMessage}, Network}; use futures::prelude::*; use futures::sync::mpsc; -use runtime_primitives::traits::{NumberFor, Block as BlockT}; +use sr_primitives::traits::{NumberFor, Block as BlockT}; use network::PeerId; use tokio_timer::Delay; use log::warn; diff --git a/substrate/core/finality-grandpa/src/communication/tests.rs b/substrate/core/finality-grandpa/src/communication/tests.rs index 8b4d28d9f3..cfe41acb3c 100644 --- a/substrate/core/finality-grandpa/src/communication/tests.rs +++ b/substrate/core/finality-grandpa/src/communication/tests.rs @@ -143,7 +143,7 @@ fn voter_set_state() -> SharedVoterSetState { use crate::authorities::AuthoritySet; use crate::environment::{CompletedRound, CompletedRounds, HasVoted, VoterSetState}; use grandpa::round::State as RoundState; - use substrate_primitives::H256; + use primitives::H256; let state = RoundState::genesis((H256::zero(), 0)); let base = state.prevote_ghost.unwrap(); diff --git a/substrate/core/finality-grandpa/src/environment.rs b/substrate/core/finality-grandpa/src/environment.rs index e3189ecd92..e82cc1f421 100644 --- a/substrate/core/finality-grandpa/src/environment.rs +++ b/substrate/core/finality-grandpa/src/environment.rs @@ -33,11 +33,11 @@ use grandpa::{ BlockNumberOps, Equivocation, Error as GrandpaError, round::State as RoundState, voter, voter_set::VoterSet, }; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{ +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{ Block as BlockT, Header as HeaderT, NumberFor, One, Zero, BlockNumberToHash, }; -use substrate_primitives::{Blake2Hasher, ed25519, H256, Pair}; +use primitives::{Blake2Hasher, ed25519, H256, Pair}; use substrate_telemetry::{telemetry, CONSENSUS_INFO}; use crate::{ diff --git a/substrate/core/finality-grandpa/src/finality_proof.rs b/substrate/core/finality-grandpa/src/finality_proof.rs index e9cc08c695..f174fb04f6 100644 --- a/substrate/core/finality-grandpa/src/finality_proof.rs +++ b/substrate/core/finality-grandpa/src/finality_proof.rs @@ -45,11 +45,11 @@ use client::{ }; use parity_codec::{Encode, Decode}; use grandpa::BlockNumberOps; -use runtime_primitives::{Justification, generic::BlockId}; -use runtime_primitives::traits::{ +use sr_primitives::{Justification, generic::BlockId}; +use sr_primitives::traits::{ NumberFor, Block as BlockT, Header as HeaderT, One, }; -use substrate_primitives::{H256, Blake2Hasher}; +use primitives::{H256, Blake2Hasher}; use substrate_telemetry::{telemetry, CONSENSUS_INFO}; use fg_primitives::AuthorityId; diff --git a/substrate/core/finality-grandpa/src/import.rs b/substrate/core/finality-grandpa/src/import.rs index 2647fb5575..91e2b92182 100644 --- a/substrate/core/finality-grandpa/src/import.rs +++ b/substrate/core/finality-grandpa/src/import.rs @@ -32,13 +32,13 @@ use consensus_common::{ SelectChain, }; use fg_primitives::GrandpaApi; -use runtime_primitives::Justification; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{ +use sr_primitives::Justification; +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{ Block as BlockT, DigestFor, Header as HeaderT, NumberFor, ProvideRuntimeApi, }; -use substrate_primitives::{H256, Blake2Hasher}; +use primitives::{H256, Blake2Hasher}; use crate::{Error, CommandOrError, NewAuthoritySet, VoterCommand}; use crate::authorities::{AuthoritySet, SharedAuthoritySet, DelayKind, PendingChange}; diff --git a/substrate/core/finality-grandpa/src/justification.rs b/substrate/core/finality-grandpa/src/justification.rs index 99aedbae05..59a3d2166c 100644 --- a/substrate/core/finality-grandpa/src/justification.rs +++ b/substrate/core/finality-grandpa/src/justification.rs @@ -23,9 +23,9 @@ use client::error::Error as ClientError; use parity_codec::{Encode, Decode}; use grandpa::voter_set::VoterSet; use grandpa::{Error as GrandpaError}; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{NumberFor, Block as BlockT, Header as HeaderT}; -use substrate_primitives::{H256, Blake2Hasher}; +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{NumberFor, Block as BlockT, Header as HeaderT}; +use primitives::{H256, Blake2Hasher}; use fg_primitives::AuthorityId; use crate::{Commit, Error}; diff --git a/substrate/core/finality-grandpa/src/lib.rs b/substrate/core/finality-grandpa/src/lib.rs index 534a5d9256..2e688ed952 100644 --- a/substrate/core/finality-grandpa/src/lib.rs +++ b/substrate/core/finality-grandpa/src/lib.rs @@ -58,14 +58,14 @@ use futures::sync::mpsc; use client::{BlockchainEvents, CallExecutor, Client, backend::Backend, error::Error as ClientError}; use client::blockchain::HeaderBackend; use parity_codec::Encode; -use runtime_primitives::traits::{ +use sr_primitives::traits::{ NumberFor, Block as BlockT, DigestFor, ProvideRuntimeApi, }; use fg_primitives::GrandpaApi; use inherents::InherentDataProviders; -use runtime_primitives::generic::BlockId; +use sr_primitives::generic::BlockId; use consensus_common::SelectChain; -use substrate_primitives::{ed25519, H256, Pair, Blake2Hasher}; +use primitives::{ed25519, H256, Pair, Blake2Hasher}; use substrate_telemetry::{telemetry, CONSENSUS_INFO, CONSENSUS_DEBUG, CONSENSUS_WARN}; use serde_json; @@ -355,7 +355,7 @@ where PRA::Api: GrandpaApi, SC: SelectChain, { - use runtime_primitives::traits::Zero; + use sr_primitives::traits::Zero; let chain_info = client.info(); let genesis_hash = chain_info.chain.genesis_hash; diff --git a/substrate/core/finality-grandpa/src/light_import.rs b/substrate/core/finality-grandpa/src/light_import.rs index 133fbabb05..abc98976fd 100644 --- a/substrate/core/finality-grandpa/src/light_import.rs +++ b/substrate/core/finality-grandpa/src/light_import.rs @@ -32,13 +32,13 @@ use consensus_common::{ Error as ConsensusError, }; use network::config::{BoxFinalityProofRequestBuilder, FinalityProofRequestBuilder}; -use runtime_primitives::Justification; -use runtime_primitives::traits::{ +use sr_primitives::Justification; +use sr_primitives::traits::{ NumberFor, Block as BlockT, Header as HeaderT, ProvideRuntimeApi, DigestFor, }; use fg_primitives::{GrandpaApi, AuthorityId}; -use runtime_primitives::generic::BlockId; -use substrate_primitives::{H256, Blake2Hasher}; +use sr_primitives::generic::BlockId; +use primitives::{H256, Blake2Hasher}; use crate::aux_schema::load_decode; use crate::consensus_changes::ConsensusChanges; @@ -468,7 +468,7 @@ fn load_aux_import_data, PRA>( PRA: ProvideRuntimeApi, PRA::Api: GrandpaApi, { - use runtime_primitives::traits::Zero; + use sr_primitives::traits::Zero; let authority_set = match load_decode(aux_store, LIGHT_AUTHORITY_SET_KEY)? { Some(authority_set) => authority_set, None => { @@ -538,7 +538,7 @@ fn on_post_finalization_error(error: ClientError, value_type: &str) -> Consensus pub mod tests { use super::*; use consensus_common::ForkChoiceStrategy; - use substrate_primitives::H256; + use primitives::H256; use test_client::client::in_mem::Blockchain as InMemoryAuxStore; use test_client::runtime::{Block, Header}; use crate::tests::TestApi; diff --git a/substrate/core/finality-grandpa/src/observer.rs b/substrate/core/finality-grandpa/src/observer.rs index 2c0818c2d7..1301a6656b 100644 --- a/substrate/core/finality-grandpa/src/observer.rs +++ b/substrate/core/finality-grandpa/src/observer.rs @@ -26,8 +26,8 @@ use log::{debug, info, warn}; use consensus_common::SelectChain; use client::{CallExecutor, Client, backend::Backend}; -use runtime_primitives::traits::{NumberFor, Block as BlockT}; -use substrate_primitives::{H256, Blake2Hasher}; +use sr_primitives::traits::{NumberFor, Block as BlockT}; +use primitives::{H256, Blake2Hasher}; use crate::{ global_communication, CommandOrError, CommunicationIn, Config, environment, diff --git a/substrate/core/finality-grandpa/src/tests.rs b/substrate/core/finality-grandpa/src/tests.rs index 506da2de14..797463f5de 100644 --- a/substrate/core/finality-grandpa/src/tests.rs +++ b/substrate/core/finality-grandpa/src/tests.rs @@ -35,9 +35,9 @@ use consensus_common::import_queue::{BoxBlockImport, BoxJustificationImport, Box use std::collections::{HashMap, HashSet}; use std::result; use parity_codec::Decode; -use runtime_primitives::traits::{ApiRef, ProvideRuntimeApi, Header as HeaderT}; -use runtime_primitives::generic::BlockId; -use substrate_primitives::{NativeOrEncoded, ExecutionContext}; +use sr_primitives::traits::{ApiRef, ProvideRuntimeApi, Header as HeaderT}; +use sr_primitives::generic::BlockId; +use primitives::{NativeOrEncoded, ExecutionContext}; use fg_primitives::AuthorityId; use authorities::AuthoritySet; @@ -273,7 +273,7 @@ impl GrandpaApi for RuntimeApi { _: ExecutionContext, _: Option<()>, _: Vec, - ) -> Result>> { + ) -> Result>> { Ok(self.inner.genesis_authorities.clone()).map(NativeOrEncoded::Native) } @@ -342,7 +342,7 @@ impl AuthoritySetForFinalityChecker for TestApi { const TEST_GOSSIP_DURATION: Duration = Duration::from_millis(500); -fn make_ids(keys: &[Ed25519Keyring]) -> Vec<(substrate_primitives::ed25519::Public, u64)> { +fn make_ids(keys: &[Ed25519Keyring]) -> Vec<(primitives::ed25519::Public, u64)> { keys.iter() .map(|key| AuthorityId::from_raw(key.to_raw_public())) .map(|id| (id, 1)) @@ -704,7 +704,7 @@ fn justification_is_emitted_when_consensus_data_changes() { let mut net = GrandpaTestNet::new(TestApi::new(make_ids(peers)), 3); // import block#1 WITH consensus data change - let new_authorities = vec![substrate_primitives::sr25519::Public::from_raw([42; 32])]; + let new_authorities = vec![primitives::sr25519::Public::from_raw([42; 32])]; net.peer(0).push_authorities_change_block(new_authorities); net.block_until_sync(&mut runtime); let net = Arc::new(Mutex::new(net)); @@ -1320,7 +1320,7 @@ fn finality_proof_is_fetched_by_light_client_when_consensus_data_changes() { // import block#1 WITH consensus data change. Light client ignores justification // && instead fetches finality proof for block #1 - net.peer(0).push_authorities_change_block(vec![substrate_primitives::sr25519::Public::from_raw([42; 32])]); + net.peer(0).push_authorities_change_block(vec![primitives::sr25519::Public::from_raw([42; 32])]); let net = Arc::new(Mutex::new(net)); run_to_completion(&mut runtime, 1, net.clone(), peers); net.lock().block_until_sync(&mut runtime); @@ -1383,7 +1383,7 @@ fn empty_finality_proof_is_returned_to_light_client_when_authority_set_is_differ // normally it will reach light client, but because of the forced change, it will not net.lock().peer(0).push_blocks(8, false); // best is #9 net.lock().peer(0).push_authorities_change_block( - vec![substrate_primitives::sr25519::Public::from_raw([42; 32])] + vec![primitives::sr25519::Public::from_raw([42; 32])] ); // #10 net.lock().peer(0).push_blocks(1, false); // best is #11 net.lock().block_until_sync(&mut runtime); diff --git a/substrate/core/finality-grandpa/src/until_imported.rs b/substrate/core/finality-grandpa/src/until_imported.rs index 5575a0d2c6..af797c99ab 100644 --- a/substrate/core/finality-grandpa/src/until_imported.rs +++ b/substrate/core/finality-grandpa/src/until_imported.rs @@ -29,7 +29,7 @@ use futures::stream::Fuse; use futures03::{StreamExt as _, TryStreamExt as _}; use grandpa::voter; use parking_lot::Mutex; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; use tokio_timer::Interval; use std::collections::{HashMap, VecDeque}; diff --git a/substrate/core/inherents/Cargo.toml b/substrate/core/inherents/Cargo.toml index 1824eef80f..7174b7acea 100644 --- a/substrate/core/inherents/Cargo.toml +++ b/substrate/core/inherents/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" parking_lot = { version = "0.8.0", optional = true } rstd = { package = "sr-std", path = "../sr-std", default-features = false } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } -runtime_primitives = { package = "sr-primitives", path = "../sr-primitives", default-features = false } +sr-primitives = { path = "../sr-primitives", default-features = false } [features] default = [ "std" ] @@ -16,5 +16,5 @@ std = [ "parking_lot", "rstd/std", "parity-codec/std", - "runtime_primitives/std", + "sr-primitives/std", ] diff --git a/substrate/core/inherents/src/lib.rs b/substrate/core/inherents/src/lib.rs index 040f289957..a5dcfdffcf 100644 --- a/substrate/core/inherents/src/lib.rs +++ b/substrate/core/inherents/src/lib.rs @@ -44,7 +44,7 @@ use parking_lot::RwLock; #[cfg(feature = "std")] use std::{sync::Arc, format}; -pub use runtime_primitives::RuntimeString; +pub use sr_primitives::RuntimeString; /// An identifier for an inherent. pub type InherentIdentifier = [u8; 8]; diff --git a/substrate/core/keyring/Cargo.toml b/substrate/core/keyring/Cargo.toml index 299d822843..84d6f765b7 100644 --- a/substrate/core/keyring/Cargo.toml +++ b/substrate/core/keyring/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -substrate-primitives = { path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../primitives" } sr-primitives = { path = "../sr-primitives" } lazy_static = { version = "1.0" } strum = "0.14.0" diff --git a/substrate/core/keyring/src/ed25519.rs b/substrate/core/keyring/src/ed25519.rs index bec4c80156..a66cc73b56 100644 --- a/substrate/core/keyring/src/ed25519.rs +++ b/substrate/core/keyring/src/ed25519.rs @@ -18,8 +18,8 @@ use std::{collections::HashMap, ops::Deref}; use lazy_static::lazy_static; -use substrate_primitives::{ed25519::{Pair, Public, Signature}, Pair as PairT, Public as PublicT, H256}; -pub use substrate_primitives::ed25519; +use primitives::{ed25519::{Pair, Public, Signature}, Pair as PairT, Public as PublicT, H256}; +pub use primitives::ed25519; /// Set of test accounts. #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum_macros::Display, strum_macros::EnumIter)] @@ -168,7 +168,7 @@ impl Deref for Keyring { #[cfg(test)] mod tests { use super::*; - use substrate_primitives::{ed25519::Pair, Pair as PairT}; + use primitives::{ed25519::Pair, Pair as PairT}; #[test] fn should_work() { diff --git a/substrate/core/keyring/src/sr25519.rs b/substrate/core/keyring/src/sr25519.rs index 202b954966..aefdc05fa7 100644 --- a/substrate/core/keyring/src/sr25519.rs +++ b/substrate/core/keyring/src/sr25519.rs @@ -19,8 +19,8 @@ use std::collections::HashMap; use std::ops::Deref; use lazy_static::lazy_static; -use substrate_primitives::{sr25519::{Pair, Public, Signature}, Pair as PairT, Public as PublicT, H256}; -pub use substrate_primitives::sr25519; +use primitives::{sr25519::{Pair, Public, Signature}, Pair as PairT, Public as PublicT, H256}; +pub use primitives::sr25519; /// Set of test accounts. #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, strum_macros::Display, strum_macros::EnumIter)] @@ -178,7 +178,7 @@ impl Deref for Keyring { #[cfg(test)] mod tests { use super::*; - use substrate_primitives::{sr25519::Pair, Pair as PairT}; + use primitives::{sr25519::Pair, Pair as PairT}; #[test] fn should_work() { diff --git a/substrate/core/keystore/Cargo.toml b/substrate/core/keystore/Cargo.toml index 1d4f146b7e..00a653c114 100644 --- a/substrate/core/keystore/Cargo.toml +++ b/substrate/core/keystore/Cargo.toml @@ -6,7 +6,7 @@ edition = "2018" [dependencies] derive_more = "0.14.0" -substrate-primitives = { path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../primitives" } hex = "0.3" rand = "0.6" serde_json = "1.0" diff --git a/substrate/core/keystore/src/lib.rs b/substrate/core/keystore/src/lib.rs index 77106059f8..89cfca559c 100644 --- a/substrate/core/keystore/src/lib.rs +++ b/substrate/core/keystore/src/lib.rs @@ -23,7 +23,7 @@ use std::path::PathBuf; use std::fs::{self, File}; use std::io::{self, Write}; -use substrate_primitives::crypto::{KeyTypeId, Pair, Public}; +use primitives::crypto::{KeyTypeId, Pair, Public}; /// Keystore error. #[derive(Debug, derive_more::Display, derive_more::From)] @@ -165,8 +165,8 @@ impl Store { mod tests { use super::*; use tempdir::TempDir; - use substrate_primitives::ed25519; - use substrate_primitives::crypto::Ss58Codec; + use primitives::ed25519; + use primitives::crypto::Ss58Codec; #[test] fn basic_store() { diff --git a/substrate/core/network/Cargo.toml b/substrate/core/network/Cargo.toml index 6fd793a841..3d687486c0 100644 --- a/substrate/core/network/Cargo.toml +++ b/substrate/core/network/Cargo.toml @@ -24,10 +24,10 @@ rustc-hex = "2.0" rand = "0.6" libp2p = { version = "0.11.0", default-features = false, features = ["secp256k1", "libp2p-websocket"] } fork-tree = { path = "../../core/utils/fork-tree" } -primitives = { package = "substrate-primitives", path = "../../core/primitives" } consensus = { package = "substrate-consensus-common", path = "../../core/consensus/common" } client = { package = "substrate-client", path = "../../core/client" } -runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" } +sr-primitives = { path = "../../core/sr-primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } parity-codec = { version = "4.1.1", features = ["derive"] } peerset = { package = "substrate-peerset", path = "../../core/peerset" } serde = { version = "1.0.70", features = ["derive"] } diff --git a/substrate/core/network/src/behaviour.rs b/substrate/core/network/src/behaviour.rs index 0fc034edfc..f2144c89a5 100644 --- a/substrate/core/network/src/behaviour.rs +++ b/substrate/core/network/src/behaviour.rs @@ -27,7 +27,7 @@ use libp2p::swarm::{NetworkBehaviourAction, NetworkBehaviourEventProcess}; use libp2p::core::{nodes::Substream, muxing::StreamMuxerBox}; use libp2p::multihash::Multihash; use log::warn; -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::traits::Block as BlockT; use std::iter; use void; diff --git a/substrate/core/network/src/chain.rs b/substrate/core/network/src/chain.rs index 76096a44aa..e857aa095c 100644 --- a/substrate/core/network/src/chain.rs +++ b/substrate/core/network/src/chain.rs @@ -20,9 +20,9 @@ use client::{self, Client as SubstrateClient, ClientInfo, BlockStatus, CallExecu use client::error::Error; use client::light::fetcher::ChangesProof; use consensus::{BlockImport, Error as ConsensusError}; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT}; -use runtime_primitives::generic::{BlockId}; -use runtime_primitives::Justification; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT}; +use sr_primitives::generic::{BlockId}; +use sr_primitives::Justification; use primitives::{H256, Blake2Hasher, storage::StorageKey}; /// Local client abstraction for the network. diff --git a/substrate/core/network/src/config.rs b/substrate/core/network/src/config.rs index 7c7c540d11..13e9a0d3a5 100644 --- a/substrate/core/network/src/config.rs +++ b/substrate/core/network/src/config.rs @@ -28,7 +28,7 @@ use crate::service::{ExHashT, TransactionPool}; use bitflags::bitflags; use consensus::import_queue::ImportQueue; use parity_codec; -use runtime_primitives::traits::{Block as BlockT}; +use sr_primitives::traits::{Block as BlockT}; use std::sync::Arc; use libp2p::identity::{Keypair, secp256k1, ed25519}; use libp2p::wasm_ext; diff --git a/substrate/core/network/src/lib.rs b/substrate/core/network/src/lib.rs index 4e2a9c882c..28437901e2 100644 --- a/substrate/core/network/src/lib.rs +++ b/substrate/core/network/src/lib.rs @@ -202,7 +202,7 @@ pub use on_demand_layer::{OnDemand, RemoteResponse}; // Used by the `construct_simple_protocol!` macro. #[doc(hidden)] -pub use runtime_primitives::traits::Block as BlockT; +pub use sr_primitives::traits::Block as BlockT; use libp2p::core::ConnectedPoint; use serde::{Deserialize, Serialize}; diff --git a/substrate/core/network/src/on_demand_layer.rs b/substrate/core/network/src/on_demand_layer.rs index 17a70bbe0d..1cbb5387d6 100644 --- a/substrate/core/network/src/on_demand_layer.rs +++ b/substrate/core/network/src/on_demand_layer.rs @@ -25,7 +25,7 @@ use client::error::Error as ClientError; use client::light::fetcher::{Fetcher, FetchChecker, RemoteHeaderRequest, RemoteCallRequest, RemoteReadRequest, RemoteChangesRequest, RemoteReadChildRequest, RemoteBodyRequest}; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; /// Implements the `Fetcher` trait of the client. Makes it possible for the light client to perform /// network requests for some state. diff --git a/substrate/core/network/src/protocol.rs b/substrate/core/network/src/protocol.rs index 0d71955474..e23ec1e099 100644 --- a/substrate/core/network/src/protocol.rs +++ b/substrate/core/network/src/protocol.rs @@ -24,8 +24,8 @@ use libp2p::swarm::{ProtocolsHandler, IntoProtocolsHandler}; use libp2p::swarm::{NetworkBehaviour, NetworkBehaviourAction, PollParameters}; use primitives::storage::StorageKey; use consensus::{import_queue::IncomingBlock, import_queue::Origin, BlockOrigin}; -use runtime_primitives::{generic::BlockId, ConsensusEngineId, Justification}; -use runtime_primitives::traits::{ +use sr_primitives::{generic::BlockId, ConsensusEngineId, Justification}; +use sr_primitives::traits::{ Block as BlockT, Header as HeaderT, NumberFor, One, Zero, CheckedSub, SaturatedConversion }; diff --git a/substrate/core/network/src/protocol/consensus_gossip.rs b/substrate/core/network/src/protocol/consensus_gossip.rs index f134326959..c2a2debaea 100644 --- a/substrate/core/network/src/protocol/consensus_gossip.rs +++ b/substrate/core/network/src/protocol/consensus_gossip.rs @@ -25,8 +25,8 @@ use log::{trace, debug}; use futures::sync::mpsc; use lru_cache::LruCache; use libp2p::PeerId; -use runtime_primitives::traits::{Block as BlockT, Hash, HashFor}; -use runtime_primitives::ConsensusEngineId; +use sr_primitives::traits::{Block as BlockT, Hash, HashFor}; +use sr_primitives::ConsensusEngineId; pub use crate::message::generic::{Message, ConsensusMessage}; use crate::protocol::Context; use crate::config::Roles; @@ -556,7 +556,7 @@ impl ConsensusGossip { #[cfg(test)] mod tests { - use runtime_primitives::testing::{H256, Block as RawBlock, ExtrinsicWrapper}; + use sr_primitives::testing::{H256, Block as RawBlock, ExtrinsicWrapper}; use futures::Stream; use super::*; diff --git a/substrate/core/network/src/protocol/message.rs b/substrate/core/network/src/protocol/message.rs index 5aa47d9c26..def9d4c225 100644 --- a/substrate/core/network/src/protocol/message.rs +++ b/substrate/core/network/src/protocol/message.rs @@ -17,7 +17,7 @@ //! Network packet message types. These get serialized and put into the lower level protocol payload. use bitflags::bitflags; -use runtime_primitives::{ConsensusEngineId, traits::{Block as BlockT, Header as HeaderT}}; +use sr_primitives::{ConsensusEngineId, traits::{Block as BlockT, Header as HeaderT}}; use parity_codec::{Encode, Decode, Input, Output}; pub use self::generic::{ BlockAnnounce, RemoteCallRequest, RemoteReadRequest, @@ -126,7 +126,7 @@ pub struct RemoteReadResponse { /// Generic types. pub mod generic { use parity_codec::{Encode, Decode}; - use runtime_primitives::Justification; + use sr_primitives::Justification; use crate::config::Roles; use super::{ RemoteReadResponse, Transactions, Direction, diff --git a/substrate/core/network/src/protocol/on_demand.rs b/substrate/core/network/src/protocol/on_demand.rs index 7f07ab96f9..9d35535e21 100644 --- a/substrate/core/network/src/protocol/on_demand.rs +++ b/substrate/core/network/src/protocol/on_demand.rs @@ -29,7 +29,7 @@ use client::light::fetcher::{FetchChecker, RemoteHeaderRequest, use crate::message::{self, BlockAttributes, Direction, FromBlock, RequestId}; use libp2p::PeerId; use crate::config::Roles; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor}; /// Remote request timeout. const REQUEST_TIMEOUT: Duration = Duration::from_secs(15); @@ -637,7 +637,7 @@ pub mod tests { use std::sync::Arc; use std::time::Instant; use futures::{Future, sync::oneshot}; - use runtime_primitives::traits::{Block as BlockT, NumberFor, Header as HeaderT}; + use sr_primitives::traits::{Block as BlockT, NumberFor, Header as HeaderT}; use client::{error::{Error as ClientError, Result as ClientResult}}; use client::light::fetcher::{FetchChecker, RemoteHeaderRequest, ChangesProof, RemoteCallRequest, RemoteReadRequest, diff --git a/substrate/core/network/src/protocol/specialization.rs b/substrate/core/network/src/protocol/specialization.rs index 7f6b7dc44f..e2c444ea88 100644 --- a/substrate/core/network/src/protocol/specialization.rs +++ b/substrate/core/network/src/protocol/specialization.rs @@ -20,7 +20,7 @@ pub use crate::protocol::event::{DhtEvent, Event}; use crate::protocol::Context; use libp2p::PeerId; -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::traits::Block as BlockT; /// A specialization of the substrate network protocol. Handles events and sends messages. pub trait NetworkSpecialization: Send + Sync + 'static { diff --git a/substrate/core/network/src/protocol/sync.rs b/substrate/core/network/src/protocol/sync.rs index e4e1c35599..12f0ac6568 100644 --- a/substrate/core/network/src/protocol/sync.rs +++ b/substrate/core/network/src/protocol/sync.rs @@ -39,7 +39,7 @@ use either::Either; use extra_requests::ExtraRequests; use libp2p::PeerId; use log::{debug, trace, warn, info, error}; -use runtime_primitives::{ +use sr_primitives::{ Justification, generic::BlockId, traits::{Block as BlockT, Header, NumberFor, Zero, One, CheckedSub, SaturatedConversion} diff --git a/substrate/core/network/src/protocol/sync/blocks.rs b/substrate/core/network/src/protocol/sync/blocks.rs index ff8d9907af..90264249ea 100644 --- a/substrate/core/network/src/protocol/sync/blocks.rs +++ b/substrate/core/network/src/protocol/sync/blocks.rs @@ -21,7 +21,7 @@ use std::collections::{HashMap, BTreeMap}; use std::collections::hash_map::Entry; use log::trace; use libp2p::PeerId; -use runtime_primitives::traits::{Block as BlockT, NumberFor, One}; +use sr_primitives::traits::{Block as BlockT, NumberFor, One}; use crate::message; const MAX_PARALLEL_DOWNLOADS: u32 = 1; @@ -202,7 +202,7 @@ impl BlockCollection { mod test { use super::{BlockCollection, BlockData, BlockRangeState}; use crate::{message, PeerId}; - use runtime_primitives::testing::{Block as RawBlock, ExtrinsicWrapper}; + use sr_primitives::testing::{Block as RawBlock, ExtrinsicWrapper}; use primitives::H256; type Block = RawBlock>; diff --git a/substrate/core/network/src/protocol/sync/extra_requests.rs b/substrate/core/network/src/protocol/sync/extra_requests.rs index c4f6de05a2..0ee009cab8 100644 --- a/substrate/core/network/src/protocol/sync/extra_requests.rs +++ b/substrate/core/network/src/protocol/sync/extra_requests.rs @@ -19,7 +19,7 @@ use crate::protocol::sync::{PeerSync, PeerSyncState}; use fork_tree::ForkTree; use libp2p::PeerId; use log::warn; -use runtime_primitives::traits::{Block as BlockT, NumberFor}; +use sr_primitives::traits::{Block as BlockT, NumberFor}; use std::collections::{HashMap, HashSet, VecDeque}; use std::time::{Duration, Instant}; diff --git a/substrate/core/network/src/service.rs b/substrate/core/network/src/service.rs index 2075aef286..acd3bbeab7 100644 --- a/substrate/core/network/src/service.rs +++ b/substrate/core/network/src/service.rs @@ -38,7 +38,7 @@ use libp2p::core::{transport::boxed::Boxed, muxing::StreamMuxerBox}; use libp2p::swarm::NetworkBehaviour; use parking_lot::Mutex; use peerset::PeersetHandle; -use runtime_primitives::{traits::{Block as BlockT, NumberFor}, ConsensusEngineId}; +use sr_primitives::{traits::{Block as BlockT, NumberFor}, ConsensusEngineId}; use crate::{behaviour::{Behaviour, BehaviourOut}, config::parse_str_addr}; use crate::{NetworkState, NetworkStateNotConnectedPeer, NetworkStatePeer}; @@ -536,7 +536,7 @@ pub trait NetworkStateInfo { impl NetworkStateInfo for NetworkService where - B: runtime_primitives::traits::Block, + B: sr_primitives::traits::Block, S: NetworkSpecialization, H: ExHashT, { diff --git a/substrate/core/network/src/test/block_import.rs b/substrate/core/network/src/test/block_import.rs index eb49dbda7a..ce58755a89 100644 --- a/substrate/core/network/src/test/block_import.rs +++ b/substrate/core/network/src/test/block_import.rs @@ -21,7 +21,7 @@ use consensus::import_queue::{ }; use test_client::{self, prelude::*}; use test_client::runtime::{Block, Hash}; -use runtime_primitives::generic::BlockId; +use sr_primitives::generic::BlockId; use super::*; fn prepare_good_block() -> (TestClient, Hash, u64, PeerId, IncomingBlock) { diff --git a/substrate/core/network/src/test/mod.rs b/substrate/core/network/src/test/mod.rs index 8f9fe7d097..c416d347d6 100644 --- a/substrate/core/network/src/test/mod.rs +++ b/substrate/core/network/src/test/mod.rs @@ -47,9 +47,9 @@ use libp2p::PeerId; use parking_lot::Mutex; use primitives::{H256, Blake2Hasher}; use crate::protocol::{Context, ProtocolConfig}; -use runtime_primitives::generic::{BlockId, OpaqueDigestItemId}; -use runtime_primitives::traits::{Block as BlockT, Header, NumberFor}; -use runtime_primitives::Justification; +use sr_primitives::generic::{BlockId, OpaqueDigestItemId}; +use sr_primitives::traits::{Block as BlockT, Header, NumberFor}; +use sr_primitives::Justification; use crate::service::TransactionPool; use crate::specialization::NetworkSpecialization; use test_client::{self, AccountKeyring}; diff --git a/substrate/core/offchain/Cargo.toml b/substrate/core/offchain/Cargo.toml index ecc098ae08..694ce38663 100644 --- a/substrate/core/offchain/Cargo.toml +++ b/substrate/core/offchain/Cargo.toml @@ -14,7 +14,7 @@ offchain-primitives = { package = "substrate-offchain-primitives", path = "./pri parity-codec = { version = "4.1.1", features = ["derive"] } parking_lot = "0.8.0" primitives = { package = "substrate-primitives", path = "../../core/primitives" } -runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" } +sr-primitives = { path = "../../core/sr-primitives" } transaction_pool = { package = "substrate-transaction-pool", path = "../../core/transaction-pool" } network = { package = "substrate-network", path = "../../core/network" } diff --git a/substrate/core/offchain/primitives/Cargo.toml b/substrate/core/offchain/primitives/Cargo.toml index a081f681b6..c96a579c44 100644 --- a/substrate/core/offchain/primitives/Cargo.toml +++ b/substrate/core/offchain/primitives/Cargo.toml @@ -8,11 +8,11 @@ edition = "2018" [dependencies] client = { package = "substrate-client", path = "../../client", default-features = false } -runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives", default-features = false } +sr-primitives = { path = "../../sr-primitives", default-features = false } [features] default = ["std"] std = [ "client/std", - "runtime_primitives/std" + "sr-primitives/std" ] diff --git a/substrate/core/offchain/primitives/src/lib.rs b/substrate/core/offchain/primitives/src/lib.rs index c05e8dceb9..d51239483a 100644 --- a/substrate/core/offchain/primitives/src/lib.rs +++ b/substrate/core/offchain/primitives/src/lib.rs @@ -20,7 +20,7 @@ #![warn(missing_docs)] use client::decl_runtime_apis; -use runtime_primitives::traits::NumberFor; +use sr_primitives::traits::NumberFor; decl_runtime_apis! { /// The offchain worker api. diff --git a/substrate/core/offchain/src/api.rs b/substrate/core/offchain/src/api.rs index 711611ada5..8af7b333f5 100644 --- a/substrate/core/offchain/src/api.rs +++ b/substrate/core/offchain/src/api.rs @@ -15,9 +15,9 @@ // along with Substrate. If not, see . use std::{ - str::FromStr, - sync::Arc, - convert::{TryFrom, TryInto}, + str::FromStr, + sync::Arc, + convert::{TryFrom, TryInto}, time::{SystemTime, Duration}, thread::sleep, }; @@ -36,7 +36,7 @@ use primitives::offchain::{ }; use primitives::crypto::{Pair, Public, Protected}; use primitives::{ed25519, sr25519}; -use runtime_primitives::{ +use sr_primitives::{ generic::BlockId, traits::{self, Extrinsic}, }; @@ -569,7 +569,7 @@ impl AsyncApi { mod tests { use super::*; use std::convert::TryFrom; - use runtime_primitives::traits::Zero; + use sr_primitives::traits::Zero; use client_db::offchain::LocalStorage; use crate::tests::TestProvider; use network::PeerId; @@ -602,14 +602,14 @@ mod tests { #[test] fn should_get_timestamp() { let mut api = offchain_api().0; - + // Get timestamp from std. let now = SystemTime::now(); let d: u64 = now.duration_since(SystemTime::UNIX_EPOCH).unwrap().as_millis().try_into().unwrap(); // Get timestamp from offchain api. let timestamp = api.timestamp(); - + // Compare. assert!(timestamp.unix_millis() > 0); assert_eq!(timestamp.unix_millis(), d); @@ -627,7 +627,7 @@ mod tests { // Act. api.sleep_until(deadline); let new_now = api.timestamp(); - + // Assert. // The diff could be more than the sleep duration. assert!(new_now.unix_millis() - 100 >= now.unix_millis()); diff --git a/substrate/core/offchain/src/lib.rs b/substrate/core/offchain/src/lib.rs index d4947e271f..feacb535aa 100644 --- a/substrate/core/offchain/src/lib.rs +++ b/substrate/core/offchain/src/lib.rs @@ -45,7 +45,7 @@ use primitives::{ ExecutionContext, crypto, }; -use runtime_primitives::{ +use sr_primitives::{ generic::BlockId, traits::{self, ProvideRuntimeApi}, }; diff --git a/substrate/core/primitives/benches/benches.rs b/substrate/core/primitives/benches/benches.rs index 4a0e08978f..5245af44a8 100644 --- a/substrate/core/primitives/benches/benches.rs +++ b/substrate/core/primitives/benches/benches.rs @@ -16,10 +16,11 @@ #[macro_use] extern crate criterion; +use substrate_primitives as primitives; use criterion::{Criterion, black_box, Bencher, Fun}; use std::time::Duration; -use substrate_primitives::crypto::Pair as _; -use substrate_primitives::hashing::{twox_128, blake2_128}; +use primitives::crypto::Pair as _; +use primitives::hashing::{twox_128, blake2_128}; const MAX_KEY_SIZE: u32 = 32; @@ -71,7 +72,7 @@ fn bench_ed25519(c: &mut Criterion) { let msg = (0..msg_size) .map(|_| rand::random::()) .collect::>(); - let key = substrate_primitives::ed25519::Pair::generate().0; + let key = primitives::ed25519::Pair::generate().0; b.iter(|| key.sign(&msg)) }, vec![32, 1024, 1024 * 1024]); @@ -79,10 +80,10 @@ fn bench_ed25519(c: &mut Criterion) { let msg = (0..msg_size) .map(|_| rand::random::()) .collect::>(); - let key = substrate_primitives::ed25519::Pair::generate().0; + let key = primitives::ed25519::Pair::generate().0; let sig = key.sign(&msg); let public = key.public(); - b.iter(|| substrate_primitives::ed25519::Pair::verify(&sig, &msg, &public)) + b.iter(|| primitives::ed25519::Pair::verify(&sig, &msg, &public)) }, vec![32, 1024, 1024 * 1024]); } diff --git a/substrate/core/rpc/Cargo.toml b/substrate/core/rpc/Cargo.toml index 181cbdfd8e..a94b410775 100644 --- a/substrate/core/rpc/Cargo.toml +++ b/substrate/core/rpc/Cargo.toml @@ -23,7 +23,7 @@ network = { package = "substrate-network", path = "../network" } primitives = { package = "substrate-primitives", path = "../primitives" } state_machine = { package = "substrate-state-machine", path = "../state-machine" } transaction_pool = { package = "substrate-transaction-pool", path = "../transaction-pool" } -runtime_primitives = { package = "sr-primitives", path = "../sr-primitives" } +sr-primitives = { path = "../sr-primitives" } runtime_version = { package = "sr-version", path = "../sr-version" } [dev-dependencies] diff --git a/substrate/core/rpc/src/author/mod.rs b/substrate/core/rpc/src/author/mod.rs index 5594984d0e..4e64ff0ce2 100644 --- a/substrate/core/rpc/src/author/mod.rs +++ b/substrate/core/rpc/src/author/mod.rs @@ -32,7 +32,7 @@ use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId}; use log::warn; use parity_codec::{Encode, Decode}; use primitives::{Bytes, Blake2Hasher, H256}; -use runtime_primitives::{generic, traits}; +use sr_primitives::{generic, traits}; use self::error::Result; use transaction_pool::{ txpool::{ diff --git a/substrate/core/rpc/src/chain/mod.rs b/substrate/core/rpc/src/chain/mod.rs index d1d476c3ab..9b8192e660 100644 --- a/substrate/core/rpc/src/chain/mod.rs +++ b/substrate/core/rpc/src/chain/mod.rs @@ -33,8 +33,8 @@ use jsonrpc_derive::rpc; use jsonrpc_pubsub::{typed::Subscriber, SubscriptionId}; use log::warn; use primitives::{H256, Blake2Hasher}; -use runtime_primitives::generic::{BlockId, SignedBlock}; -use runtime_primitives::traits::{Block as BlockT, Header, NumberFor}; +use sr_primitives::generic::{BlockId, SignedBlock}; +use sr_primitives::traits::{Block as BlockT, Header, NumberFor}; use self::error::Result; pub use self::gen_client::Client as ChainClient; diff --git a/substrate/core/rpc/src/state/mod.rs b/substrate/core/rpc/src/state/mod.rs index 40ee94fdb2..0044ad77b8 100644 --- a/substrate/core/rpc/src/state/mod.rs +++ b/substrate/core/rpc/src/state/mod.rs @@ -38,8 +38,8 @@ use log::{warn, trace}; use primitives::hexdisplay::HexDisplay; use primitives::storage::{self, StorageKey, StorageData, StorageChangeSet}; use primitives::{H256, Blake2Hasher, Bytes}; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{ +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{ Block as BlockT, Header, ProvideRuntimeApi, NumberFor, SaturatedConversion }; diff --git a/substrate/core/rpc/src/system/mod.rs b/substrate/core/rpc/src/system/mod.rs index d0578590ae..c8cf97c658 100644 --- a/substrate/core/rpc/src/system/mod.rs +++ b/substrate/core/rpc/src/system/mod.rs @@ -26,7 +26,7 @@ use crate::helpers::Receiver; use futures::sync::{mpsc, oneshot}; use jsonrpc_derive::rpc; use network; -use runtime_primitives::traits::{self, Header as HeaderT}; +use sr_primitives::traits::{self, Header as HeaderT}; use self::error::Result; pub use self::helpers::{Properties, SystemInfo, Health, PeerInfo}; diff --git a/substrate/core/service/Cargo.toml b/substrate/core/service/Cargo.toml index 6a15e2eeb6..4ce3facb52 100644 --- a/substrate/core/service/Cargo.toml +++ b/substrate/core/service/Cargo.toml @@ -21,7 +21,7 @@ sysinfo = "0.9.0" target_info = "0.1" keystore = { package = "substrate-keystore", path = "../../core/keystore" } sr-io = { path = "../../core/sr-io" } -runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" } +sr-primitives = { path = "../../core/sr-primitives" } primitives = { package = "substrate-primitives", path = "../../core/primitives" } consensus_common = { package = "substrate-consensus-common", path = "../../core/consensus/common" } network = { package = "substrate-network", path = "../../core/network" } diff --git a/substrate/core/service/src/chain_ops.rs b/substrate/core/service/src/chain_ops.rs index 6e7151ee0a..39cd5f570f 100644 --- a/substrate/core/service/src/chain_ops.rs +++ b/substrate/core/service/src/chain_ops.rs @@ -21,8 +21,8 @@ use futures::prelude::*; use futures03::TryFutureExt as _; use log::{info, warn}; -use runtime_primitives::generic::{SignedBlock, BlockId}; -use runtime_primitives::traits::{SaturatedConversion, Zero, One, Block, Header, NumberFor}; +use sr_primitives::generic::{SignedBlock, BlockId}; +use sr_primitives::traits::{SaturatedConversion, Zero, One, Block, Header, NumberFor}; use consensus_common::import_queue::{ImportQueue, IncomingBlock, Link, BlockImportError, BlockImportResult}; use network::message; diff --git a/substrate/core/service/src/chain_spec.rs b/substrate/core/service/src/chain_spec.rs index 6af0f5766e..461d24e188 100644 --- a/substrate/core/service/src/chain_spec.rs +++ b/substrate/core/service/src/chain_spec.rs @@ -21,7 +21,7 @@ use std::fs::File; use std::path::PathBuf; use serde::{Serialize, Deserialize}; use primitives::storage::{StorageKey, StorageData}; -use runtime_primitives::{BuildStorage, StorageOverlay, ChildrenStorageOverlay}; +use sr_primitives::{BuildStorage, StorageOverlay, ChildrenStorageOverlay}; use serde_json as json; use crate::components::RuntimeGenesis; use network::Multiaddr; diff --git a/substrate/core/service/src/components.rs b/substrate/core/service/src/components.rs index e81380b320..dff6161f16 100644 --- a/substrate/core/service/src/components.rs +++ b/substrate/core/service/src/components.rs @@ -26,7 +26,7 @@ use consensus_common::{import_queue::ImportQueue, SelectChain}; use network::{self, OnDemand, FinalityProofProvider, NetworkStateInfo, config::BoxFinalityProofRequestBuilder}; use substrate_executor::{NativeExecutor, NativeExecutionDispatch}; use transaction_pool::txpool::{self, Options as TransactionPoolOptions, Pool as TransactionPool}; -use runtime_primitives::{ +use sr_primitives::{ BuildStorage, traits::{Block as BlockT, Header as HeaderT, ProvideRuntimeApi}, generic::BlockId }; use crate::config::Configuration; diff --git a/substrate/core/service/src/config.rs b/substrate/core/service/src/config.rs index 6f2f51ebfb..cd2364b37d 100644 --- a/substrate/core/service/src/config.rs +++ b/substrate/core/service/src/config.rs @@ -24,7 +24,7 @@ use std::{path::PathBuf, net::SocketAddr}; use transaction_pool; use crate::chain_spec::ChainSpec; use primitives::crypto::Protected; -use runtime_primitives::BuildStorage; +use sr_primitives::BuildStorage; use serde::{Serialize, de::DeserializeOwned}; use target_info::Target; use tel::TelemetryEndpoints; diff --git a/substrate/core/service/src/lib.rs b/substrate/core/service/src/lib.rs index bd600b81cb..9f5de4de1b 100644 --- a/substrate/core/service/src/lib.rs +++ b/substrate/core/service/src/lib.rs @@ -42,8 +42,8 @@ use network::{NetworkState, NetworkStateInfo}; use log::{log, info, warn, debug, error, Level}; use parity_codec::{Encode, Decode}; use primitives::{Pair, ed25519, sr25519, crypto}; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::{Header, NumberFor, SaturatedConversion, Zero}; +use sr_primitives::generic::BlockId; +use sr_primitives::traits::{Header, NumberFor, SaturatedConversion, Zero}; use substrate_executor::NativeExecutor; use sysinfo::{get_current_pid, ProcessExt, System, SystemExt}; use tel::{telemetry, SUBSTRATE_INFO}; @@ -722,7 +722,7 @@ fn build_network_future< "Polling the network future took {:?}", polling_dur ); - + Ok(Async::NotReady) }) } @@ -846,7 +846,7 @@ fn transactions_to_propagate(pool: &TransactionPool) where PoolApi: ChainApi, B: BlockT, - H: std::hash::Hash + Eq + runtime_primitives::traits::Member + serde::Serialize, + H: std::hash::Hash + Eq + sr_primitives::traits::Member + serde::Serialize, E: txpool::error::IntoPoolError + From, { pool.ready() @@ -916,7 +916,7 @@ impl offchain::AuthorityKeyProvider for AuthorityKeyProvider where - Block: runtime_primitives::traits::Block, + Block: sr_primitives::traits::Block, ConsensusPair: Pair, FinalityPair: Pair, { @@ -991,8 +991,8 @@ where /// # use node_runtime::{GenesisConfig, RuntimeApi}; /// # use std::sync::Arc; /// # use node_primitives::Block; -/// # use runtime_primitives::Justification; -/// # use runtime_primitives::traits::Block as BlockT; +/// # use sr_primitives::Justification; +/// # use sr_primitives::traits::Block as BlockT; /// # use grandpa; /// # construct_simple_protocol! { /// # pub struct NodeProtocol where Block = Block { } @@ -1178,7 +1178,7 @@ macro_rules! construct_service_factory { mod tests { use super::*; use consensus_common::SelectChain; - use runtime_primitives::traits::BlindCheckable; + use sr_primitives::traits::BlindCheckable; use substrate_test_runtime_client::{prelude::*, runtime::{Extrinsic, Transfer}}; #[test] diff --git a/substrate/core/service/test/Cargo.toml b/substrate/core/service/test/Cargo.toml index 38cdd042d6..aa3dddfc18 100644 --- a/substrate/core/service/test/Cargo.toml +++ b/substrate/core/service/test/Cargo.toml @@ -14,6 +14,6 @@ fdlimit = "0.1" service = { package = "substrate-service", path = "../../../core/service" } network = { package = "substrate-network", path = "../../../core/network" } consensus = { package = "substrate-consensus-common", path = "../../../core/consensus/common" } -primitives = { package = "substrate-primitives", path = "../../../core/primitives" } client = { package = "substrate-client", path = "../../../core/client" } sr-primitives = { path = "../../../core/sr-primitives" } +primitives = { package = "substrate-primitives", path = "../../../core/primitives" } diff --git a/substrate/core/sr-api-macros/Cargo.toml b/substrate/core/sr-api-macros/Cargo.toml index c9a91e7491..aed1c022da 100644 --- a/substrate/core/sr-api-macros/Cargo.toml +++ b/substrate/core/sr-api-macros/Cargo.toml @@ -18,9 +18,9 @@ proc-macro-crate = "0.1.3" client = { package = "substrate-client", path = "../client" } test-client = { package = "substrate-test-runtime-client", path = "../test-runtime/client" } state_machine = { package = "substrate-state-machine", path = "../state-machine" } -runtime_primitives = { package = "sr-primitives", path = "../sr-primitives" } +sr-primitives = { path = "../sr-primitives" } sr-version = { path = "../sr-version" } -substrate-primitives = { path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../primitives" } criterion = "0.2" consensus_common = { package = "substrate-consensus-common", path = "../consensus/common" } codec = { package = "parity-codec", version = "4.1.1" } diff --git a/substrate/core/sr-api-macros/benches/bench.rs b/substrate/core/sr-api-macros/benches/bench.rs index 054f73c3d4..9aba38c2d1 100644 --- a/substrate/core/sr-api-macros/benches/bench.rs +++ b/substrate/core/sr-api-macros/benches/bench.rs @@ -19,7 +19,7 @@ use test_client::{ DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt, runtime::TestAPI, }; -use runtime_primitives::{generic::BlockId, traits::ProvideRuntimeApi}; +use sr_primitives::{generic::BlockId, traits::ProvideRuntimeApi}; use state_machine::ExecutionStrategy; fn sr_api_benchmark(c: &mut Criterion) { diff --git a/substrate/core/sr-api-macros/src/lib.rs b/substrate/core/sr-api-macros/src/lib.rs index 1a315f44dd..d88fb09d1b 100644 --- a/substrate/core/sr-api-macros/src/lib.rs +++ b/substrate/core/sr-api-macros/src/lib.rs @@ -50,10 +50,10 @@ mod utils; /// /// use version::create_runtime_str; /// # extern crate test_client; -/// # extern crate runtime_primitives; -/// # extern crate substrate_primitives; +/// # extern crate sr_primitives; +/// # extern crate primitives; /// # -/// # use runtime_primitives::traits::GetNodeBlockType; +/// # use sr_primitives::traits::GetNodeBlockType; /// # use test_client::runtime::{Block, Header}; /// # /// # /// The declaration of the `Runtime` type and the implementation of the `GetNodeBlockType` diff --git a/substrate/core/sr-api-macros/tests/decl_and_impl.rs b/substrate/core/sr-api-macros/tests/decl_and_impl.rs index ba7ef23b99..36091d1f85 100644 --- a/substrate/core/sr-api-macros/tests/decl_and_impl.rs +++ b/substrate/core/sr-api-macros/tests/decl_and_impl.rs @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Substrate. If not, see . -use runtime_primitives::traits::{GetNodeBlockType, Block as BlockT}; -use runtime_primitives::generic::BlockId; +use sr_primitives::traits::{GetNodeBlockType, Block as BlockT}; +use sr_primitives::generic::BlockId; use client::runtime_api::{self, RuntimeApiInfo}; use client::{error::Result, decl_runtime_apis, impl_runtime_apis}; use test_client::runtime::Block; diff --git a/substrate/core/sr-api-macros/tests/runtime_calls.rs b/substrate/core/sr-api-macros/tests/runtime_calls.rs index 83a4f58095..75da2fe292 100644 --- a/substrate/core/sr-api-macros/tests/runtime_calls.rs +++ b/substrate/core/sr-api-macros/tests/runtime_calls.rs @@ -19,7 +19,7 @@ use test_client::{ DefaultTestClientBuilderExt, TestClientBuilder, runtime::{TestAPI, DecodeFails, Transfer, Header}, }; -use runtime_primitives::{ +use sr_primitives::{ generic::BlockId, traits::{ProvideRuntimeApi, Header as HeaderT, Hash as HashT}, }; diff --git a/substrate/core/sr-api-macros/tests/ui/changed_in_unknown_version.rs b/substrate/core/sr-api-macros/tests/ui/changed_in_unknown_version.rs index 27aa60c624..1272362005 100644 --- a/substrate/core/sr-api-macros/tests/ui/changed_in_unknown_version.rs +++ b/substrate/core/sr-api-macros/tests/ui/changed_in_unknown_version.rs @@ -1,4 +1,4 @@ -use runtime_primitives::traits::GetNodeBlockType; +use sr_primitives::traits::GetNodeBlockType; use test_client::runtime::Block; use client::decl_runtime_apis; diff --git a/substrate/core/sr-api-macros/tests/ui/declaring_old_block.rs b/substrate/core/sr-api-macros/tests/ui/declaring_old_block.rs index 6b7f380ef2..78d35579fa 100644 --- a/substrate/core/sr-api-macros/tests/ui/declaring_old_block.rs +++ b/substrate/core/sr-api-macros/tests/ui/declaring_old_block.rs @@ -1,4 +1,4 @@ -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::traits::Block as BlockT; use client::decl_runtime_apis; decl_runtime_apis! { diff --git a/substrate/core/sr-api-macros/tests/ui/declaring_old_block.stderr b/substrate/core/sr-api-macros/tests/ui/declaring_old_block.stderr index 2ab1cc675d..181aa2a3ca 100644 --- a/substrate/core/sr-api-macros/tests/ui/declaring_old_block.stderr +++ b/substrate/core/sr-api-macros/tests/ui/declaring_old_block.stderr @@ -10,10 +10,10 @@ error: `Block: BlockT` generic parameter will be added automatically by the `dec 5 | pub trait Api { | ^^^^^^ -warning: unused import: `runtime_primitives::traits::Block as BlockT` +warning: unused import: `sr_primitives::traits::Block as BlockT` --> $DIR/declaring_old_block.rs:1:5 | -1 | use runtime_primitives::traits::Block as BlockT; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1 | use sr_primitives::traits::Block as BlockT; + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: #[warn(unused_imports)] on by default diff --git a/substrate/core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs b/substrate/core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs index 1371295cc0..d63eadc1e4 100644 --- a/substrate/core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs +++ b/substrate/core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.rs @@ -1,4 +1,4 @@ -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::traits::Block as BlockT; use client::decl_runtime_apis; decl_runtime_apis! { diff --git a/substrate/core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr b/substrate/core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr index cf5fe0f53f..a591d0448c 100644 --- a/substrate/core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr +++ b/substrate/core/sr-api-macros/tests/ui/declaring_own_block_with_different_name.stderr @@ -4,10 +4,10 @@ error: `Block: BlockT` generic parameter will be added automatically by the `dec 5 | pub trait Api { | ^^^^^^ -warning: unused import: `runtime_primitives::traits::Block as BlockT` +warning: unused import: `sr_primitives::traits::Block as BlockT` --> $DIR/declaring_own_block_with_different_name.rs:1:5 | -1 | use runtime_primitives::traits::Block as BlockT; - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +1 | use sr_primitives::traits::Block as BlockT; + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: #[warn(unused_imports)] on by default diff --git a/substrate/core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs b/substrate/core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs index 4cf56bf54b..c9c334f6fd 100644 --- a/substrate/core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs +++ b/substrate/core/sr-api-macros/tests/ui/empty_impl_runtime_apis_call.rs @@ -1,4 +1,4 @@ -use runtime_primitives::traits::GetNodeBlockType; +use sr_primitives::traits::GetNodeBlockType; use test_client::runtime::Block; use client::{decl_runtime_apis, impl_runtime_apis}; diff --git a/substrate/core/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs b/substrate/core/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs index 91ffdd798a..774d017c19 100644 --- a/substrate/core/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs +++ b/substrate/core/sr-api-macros/tests/ui/impl_incorrect_method_signature.rs @@ -1,4 +1,4 @@ -use runtime_primitives::traits::GetNodeBlockType; +use sr_primitives::traits::GetNodeBlockType; use test_client::runtime::Block; use client::{decl_runtime_apis, impl_runtime_apis}; diff --git a/substrate/core/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs b/substrate/core/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs index 0871b0ff33..acca97a73d 100644 --- a/substrate/core/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs +++ b/substrate/core/sr-api-macros/tests/ui/impl_two_traits_with_same_name.rs @@ -1,4 +1,4 @@ -use runtime_primitives::traits::GetNodeBlockType; +use sr_primitives::traits::GetNodeBlockType; use test_client::runtime::Block; use client::{decl_runtime_apis, impl_runtime_apis}; diff --git a/substrate/core/sr-api-macros/tests/ui/missing_block_generic_parameter.rs b/substrate/core/sr-api-macros/tests/ui/missing_block_generic_parameter.rs index eafe53e23b..99755144f7 100644 --- a/substrate/core/sr-api-macros/tests/ui/missing_block_generic_parameter.rs +++ b/substrate/core/sr-api-macros/tests/ui/missing_block_generic_parameter.rs @@ -1,4 +1,4 @@ -use runtime_primitives::traits::GetNodeBlockType; +use sr_primitives::traits::GetNodeBlockType; use test_client::runtime::Block; use client::{decl_runtime_apis, impl_runtime_apis}; diff --git a/substrate/core/sr-api-macros/tests/ui/missing_path_for_trait.rs b/substrate/core/sr-api-macros/tests/ui/missing_path_for_trait.rs index cbf339e73b..f6f6e3dfb3 100644 --- a/substrate/core/sr-api-macros/tests/ui/missing_path_for_trait.rs +++ b/substrate/core/sr-api-macros/tests/ui/missing_path_for_trait.rs @@ -1,4 +1,4 @@ -use runtime_primitives::traits::GetNodeBlockType; +use sr_primitives::traits::GetNodeBlockType; use test_client::runtime::Block; use client::{decl_runtime_apis, impl_runtime_apis}; diff --git a/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs b/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs index 014b7bd1e8..0e7dc56951 100644 --- a/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs +++ b/substrate/core/sr-api-macros/tests/ui/type_reference_in_impl_runtime_apis_call.rs @@ -1,4 +1,4 @@ -use runtime_primitives::traits::GetNodeBlockType; +use sr_primitives::traits::GetNodeBlockType; use test_client::runtime::Block; use client::{decl_runtime_apis, impl_runtime_apis}; diff --git a/substrate/core/sr-primitives/Cargo.toml b/substrate/core/sr-primitives/Cargo.toml index a5399eb5f7..f736df0e01 100644 --- a/substrate/core/sr-primitives/Cargo.toml +++ b/substrate/core/sr-primitives/Cargo.toml @@ -9,7 +9,7 @@ num-traits = { version = "0.2", default-features = false } integer-sqrt = { version = "0.1.2" } serde = { version = "1.0", optional = true, features = ["derive"] } codec = { package = "parity-codec", version = "4.1.1", default-features = false, features = ["derive"] } -substrate-primitives = { path = "../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../sr-io", default-features = false } log = { version = "0.4", optional = true } @@ -28,5 +28,5 @@ std = [ "rstd/std", "runtime_io/std", "codec/std", - "substrate-primitives/std", + "primitives/std", ] diff --git a/substrate/core/sr-primitives/src/generic/digest.rs b/substrate/core/sr-primitives/src/generic/digest.rs index 5edb370e50..9d18f67f4c 100644 --- a/substrate/core/sr-primitives/src/generic/digest.rs +++ b/substrate/core/sr-primitives/src/generic/digest.rs @@ -105,7 +105,7 @@ pub enum DigestItem { impl ::serde::Serialize for DigestItem { fn serialize(&self, seq: S) -> Result where S: ::serde::Serializer { self.using_encoded(|bytes| { - ::substrate_primitives::bytes::serialize(bytes, seq) + ::primitives::bytes::serialize(bytes, seq) }) } } diff --git a/substrate/core/sr-primitives/src/generic/header.rs b/substrate/core/sr-primitives/src/generic/header.rs index 887aedc818..66d226b2c4 100644 --- a/substrate/core/sr-primitives/src/generic/header.rs +++ b/substrate/core/sr-primitives/src/generic/header.rs @@ -48,7 +48,7 @@ pub struct Header, Hash: HashT> { #[cfg(feature = "std")] pub fn serialize_number>(val: &T, s: S) -> Result where S: ::serde::Serializer { - use substrate_primitives::uint::U256; + use primitives::uint::U256; let v: u128 = (*val).into(); let lower = U256::from(v as u64); let upper = U256::from(v.rotate_left(64) as u64) << 64; diff --git a/substrate/core/sr-primitives/src/generic/tests.rs b/substrate/core/sr-primitives/src/generic/tests.rs index fe2ec2fe56..67e85da374 100644 --- a/substrate/core/sr-primitives/src/generic/tests.rs +++ b/substrate/core/sr-primitives/src/generic/tests.rs @@ -17,7 +17,7 @@ //! Tests for the generic implementations of Extrinsic/Header/Block. use crate::codec::{Decode, Encode}; -use substrate_primitives::H256; +use primitives::H256; use super::DigestItem; #[test] diff --git a/substrate/core/sr-primitives/src/lib.rs b/substrate/core/sr-primitives/src/lib.rs index 922fe7f9de..08cd4d1a05 100644 --- a/substrate/core/sr-primitives/src/lib.rs +++ b/substrate/core/sr-primitives/src/lib.rs @@ -35,7 +35,7 @@ pub use paste; pub use runtime_io::{StorageOverlay, ChildrenStorageOverlay}; use rstd::{prelude::*, ops, convert::TryInto}; -use substrate_primitives::{crypto, ed25519, sr25519, hash::{H256, H512}}; +use primitives::{crypto, ed25519, sr25519, hash::{H256, H512}}; use codec::{Encode, Decode}; #[cfg(feature = "std")] @@ -52,7 +52,7 @@ pub mod transaction_validity; pub use generic::{DigestItem, Digest}; /// Re-export this since it's part of the API of this crate. -pub use substrate_primitives::crypto::{key_types, KeyTypeId}; +pub use primitives::crypto::{key_types, KeyTypeId}; /// A message indicating an invalid signature in extrinsic. pub const BAD_SIGNATURE: &str = "bad signature in extrinsic"; @@ -868,14 +868,14 @@ pub struct OpaqueExtrinsic(pub Vec); #[cfg(feature = "std")] impl std::fmt::Debug for OpaqueExtrinsic { fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result { - write!(fmt, "{}", substrate_primitives::hexdisplay::HexDisplay::from(&self.0)) + write!(fmt, "{}", primitives::hexdisplay::HexDisplay::from(&self.0)) } } #[cfg(feature = "std")] impl ::serde::Serialize for OpaqueExtrinsic { fn serialize(&self, seq: S) -> Result where S: ::serde::Serializer { - codec::Encode::using_encoded(&self.0, |bytes| ::substrate_primitives::bytes::serialize(bytes, seq)) + codec::Encode::using_encoded(&self.0, |bytes| ::primitives::bytes::serialize(bytes, seq)) } } diff --git a/substrate/core/sr-primitives/src/testing.rs b/substrate/core/sr-primitives/src/testing.rs index 6ef7844fc9..0986c4f81a 100644 --- a/substrate/core/sr-primitives/src/testing.rs +++ b/substrate/core/sr-primitives/src/testing.rs @@ -25,9 +25,9 @@ use crate::traits::{ }; use crate::{generic, KeyTypeId}; use crate::weights::{GetDispatchInfo, DispatchInfo}; -pub use substrate_primitives::H256; -use substrate_primitives::U256; -use substrate_primitives::ed25519::{Public as AuthorityId}; +pub use primitives::H256; +use primitives::U256; +use primitives::ed25519::{Public as AuthorityId}; use crate::transaction_validity::TransactionValidity; /// Authority Id diff --git a/substrate/core/sr-primitives/src/traits.rs b/substrate/core/sr-primitives/src/traits.rs index 670f8d181d..2019bbf126 100644 --- a/substrate/core/sr-primitives/src/traits.rs +++ b/substrate/core/sr-primitives/src/traits.rs @@ -21,12 +21,12 @@ use rstd::{self, result, marker::PhantomData, convert::{TryFrom, TryInto}}; use runtime_io; #[cfg(feature = "std")] use std::fmt::{Debug, Display}; #[cfg(feature = "std")] use serde::{Serialize, Deserialize, de::DeserializeOwned}; -use substrate_primitives::{self, Hasher, Blake2Hasher}; +use primitives::{self, Hasher, Blake2Hasher}; use crate::codec::{Codec, Encode, Decode, HasCompact}; use crate::transaction_validity::{ValidTransaction, TransactionValidity}; use crate::generic::{Digest, DigestItem}; use crate::weights::DispatchInfo; -pub use substrate_primitives::crypto::TypedKey; +pub use primitives::crypto::TypedKey; pub use integer_sqrt::IntegerSquareRoot; pub use num_traits::{ Zero, One, Bounded, CheckedAdd, CheckedSub, CheckedMul, CheckedDiv, @@ -57,15 +57,15 @@ pub trait Verify { fn verify>(&self, msg: L, signer: &Self::Signer) -> bool; } -impl Verify for substrate_primitives::ed25519::Signature { - type Signer = substrate_primitives::ed25519::Public; +impl Verify for primitives::ed25519::Signature { + type Signer = primitives::ed25519::Public; fn verify>(&self, mut msg: L, signer: &Self::Signer) -> bool { runtime_io::ed25519_verify(self.as_ref(), msg.get(), signer) } } -impl Verify for substrate_primitives::sr25519::Signature { - type Signer = substrate_primitives::sr25519::Public; +impl Verify for primitives::sr25519::Signature { + type Signer = primitives::sr25519::Public; fn verify>(&self, mut msg: L, signer: &Self::Signer) -> bool { runtime_io::sr25519_verify(self.as_ref(), msg.get(), signer) } @@ -458,7 +458,7 @@ pub trait Hash: 'static + MaybeSerializeDebug + Clone + Eq + PartialEq { // Stup pub struct BlakeTwo256; impl Hash for BlakeTwo256 { - type Output = substrate_primitives::H256; + type Output = primitives::H256; type Hasher = Blake2Hasher; fn hash(s: &[u8]) -> Self::Output { runtime_io::blake2_256(s).into() @@ -493,10 +493,10 @@ pub trait CheckEqual { fn check_equal(&self, other: &Self); } -impl CheckEqual for substrate_primitives::H256 { +impl CheckEqual for primitives::H256 { #[cfg(feature = "std")] fn check_equal(&self, other: &Self) { - use substrate_primitives::hexdisplay::HexDisplay; + use primitives::hexdisplay::HexDisplay; if self != other { println!("Hash: given={}, expected={}", HexDisplay::from(self.as_fixed_bytes()), HexDisplay::from(other.as_fixed_bytes())); } diff --git a/substrate/core/sr-version/Cargo.toml b/substrate/core/sr-version/Cargo.toml index fb9b0a4688..e7ce3327a0 100644 --- a/substrate/core/sr-version/Cargo.toml +++ b/substrate/core/sr-version/Cargo.toml @@ -9,7 +9,7 @@ impl-serde = { version = "0.1", optional = true } serde = { version = "1.0", optional = true, features = ["derive"] } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } rstd = { package = "sr-std", path = "../sr-std", default-features = false } -runtime_primitives = { package = "sr-primitives", path = "../sr-primitives", default-features = false } +sr-primitives = { path = "../sr-primitives", default-features = false } [features] default = ["std"] @@ -18,5 +18,5 @@ std = [ "serde", "parity-codec/std", "rstd/std", - "runtime_primitives/std", + "sr-primitives/std", ] diff --git a/substrate/core/sr-version/src/lib.rs b/substrate/core/sr-version/src/lib.rs index 179146cc84..12998cecbc 100644 --- a/substrate/core/sr-version/src/lib.rs +++ b/substrate/core/sr-version/src/lib.rs @@ -25,13 +25,13 @@ use std::fmt; #[cfg(feature = "std")] use std::collections::HashSet; #[cfg(feature = "std")] -use runtime_primitives::traits::RuntimeApiInfo; +use sr_primitives::traits::RuntimeApiInfo; use parity_codec::Encode; #[cfg(feature = "std")] use parity_codec::Decode; -use runtime_primitives::RuntimeString; -pub use runtime_primitives::create_runtime_str; +use sr_primitives::RuntimeString; +pub use sr_primitives::create_runtime_str; /// The identity of a particular API interface that the runtime might provide. pub type ApiId = [u8; 8]; diff --git a/substrate/core/test-client/Cargo.toml b/substrate/core/test-client/Cargo.toml index 0d709fab68..abb42daea2 100644 --- a/substrate/core/test-client/Cargo.toml +++ b/substrate/core/test-client/Cargo.toml @@ -14,5 +14,5 @@ hash-db = "0.14.0" keyring = { package = "substrate-keyring", path = "../keyring" } parity-codec = "4.1.1" primitives = { package = "substrate-primitives", path = "../primitives" } -runtime_primitives = { package = "sr-primitives", path = "../sr-primitives" } +sr-primitives = { path = "../sr-primitives" } state_machine = { package = "substrate-state-machine", path = "../state-machine" } diff --git a/substrate/core/test-client/src/client_ext.rs b/substrate/core/test-client/src/client_ext.rs index cb0d5c1736..e8fe0a1f8b 100644 --- a/substrate/core/test-client/src/client_ext.rs +++ b/substrate/core/test-client/src/client_ext.rs @@ -22,9 +22,9 @@ use consensus::{ ForkChoiceStrategy, }; use hash_db::Hasher; -use runtime_primitives::Justification; -use runtime_primitives::traits::{Block as BlockT}; -use runtime_primitives::generic::BlockId; +use sr_primitives::Justification; +use sr_primitives::traits::{Block as BlockT}; +use sr_primitives::generic::BlockId; use primitives::Blake2Hasher; use parity_codec::alloc::collections::hash_map::HashMap; diff --git a/substrate/core/test-client/src/lib.rs b/substrate/core/test-client/src/lib.rs index 27237e13b6..175996a432 100644 --- a/substrate/core/test-client/src/lib.rs +++ b/substrate/core/test-client/src/lib.rs @@ -31,7 +31,7 @@ pub use keyring::{ sr25519::Keyring as Sr25519Keyring, }; pub use primitives::Blake2Hasher; -pub use runtime_primitives::{StorageOverlay, ChildrenStorageOverlay}; +pub use sr_primitives::{StorageOverlay, ChildrenStorageOverlay}; pub use state_machine::ExecutionStrategy; use std::sync::Arc; @@ -39,7 +39,7 @@ use std::collections::HashMap; use futures::future::Ready; use hash_db::Hasher; use primitives::storage::well_known_keys; -use runtime_primitives::traits::{ +use sr_primitives::traits::{ Block as BlockT, NumberFor }; use client::LocalCallExecutor; diff --git a/substrate/core/test-runtime/Cargo.toml b/substrate/core/test-runtime/Cargo.toml index 6302753950..532d5a4b38 100644 --- a/substrate/core/test-runtime/Cargo.toml +++ b/substrate/core/test-runtime/Cargo.toml @@ -17,7 +17,7 @@ aura-primitives = { package = "substrate-consensus-aura-primitives", path = "../ babe-primitives = { package = "substrate-consensus-babe-primitives", path = "../consensus/babe/primitives", default-features = false } rstd = { package = "sr-std", path = "../sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../sr-io", default-features = false } -runtime_primitives = { package = "sr-primitives", path = "../sr-primitives", default-features = false } +sr-primitives = { path = "../sr-primitives", default-features = false } runtime_version = { package = "sr-version", path = "../sr-version", default-features = false } runtime_support = { package = "srml-support", path = "../../srml/support", default-features = false } substrate-trie = { path = "../trie", default-features = false } @@ -53,7 +53,7 @@ std = [ "runtime_support/std", "primitives/std", "inherents/std", - "runtime_primitives/std", + "sr-primitives/std", "runtime_version/std", "aura-primitives/std", "babe-primitives/std", diff --git a/substrate/core/test-runtime/client/Cargo.toml b/substrate/core/test-runtime/client/Cargo.toml index 4905678ae9..5e6a676990 100644 --- a/substrate/core/test-runtime/client/Cargo.toml +++ b/substrate/core/test-runtime/client/Cargo.toml @@ -8,7 +8,7 @@ edition = "2018" generic-test-client = { package = "substrate-test-client", path = "../../test-client" } primitives = { package = "substrate-primitives", path = "../../primitives" } runtime = { package = "substrate-test-runtime", path = "../../test-runtime", default-features = false } -runtime_primitives = { package = "sr-primitives", path = "../../sr-primitives" } +sr-primitives = { path = "../../sr-primitives" } [features] default = [ diff --git a/substrate/core/test-runtime/client/src/block_builder_ext.rs b/substrate/core/test-runtime/client/src/block_builder_ext.rs index 9b7d343f02..c389a946ba 100644 --- a/substrate/core/test-runtime/client/src/block_builder_ext.rs +++ b/substrate/core/test-runtime/client/src/block_builder_ext.rs @@ -17,7 +17,7 @@ //! Block Builder extensions for tests. use runtime; -use runtime_primitives::traits::ProvideRuntimeApi; +use sr_primitives::traits::ProvideRuntimeApi; use generic_test_client::client; use generic_test_client::client::block_builder::api::BlockBuilder; diff --git a/substrate/core/test-runtime/client/src/lib.rs b/substrate/core/test-runtime/client/src/lib.rs index 4383a80e68..36a2fd3e86 100644 --- a/substrate/core/test-runtime/client/src/lib.rs +++ b/substrate/core/test-runtime/client/src/lib.rs @@ -27,7 +27,7 @@ pub use generic_test_client::*; pub use runtime; use runtime::genesismap::{GenesisConfig, additional_storage_with_genesis}; -use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, Hash as HashT}; +use sr_primitives::traits::{Block as BlockT, Header as HeaderT, Hash as HashT}; /// A prelude to import in tests. pub mod prelude { diff --git a/substrate/core/test-runtime/client/src/trait_tests.rs b/substrate/core/test-runtime/client/src/trait_tests.rs index 3d013e3e74..37fad9c7a1 100644 --- a/substrate/core/test-runtime/client/src/trait_tests.rs +++ b/substrate/core/test-runtime/client/src/trait_tests.rs @@ -28,8 +28,8 @@ use crate::{AccountKeyring, ClientExt, TestClientBuilder, TestClientBuilderExt}; use generic_test_client::consensus::BlockOrigin; use primitives::Blake2Hasher; use runtime::{self, Transfer}; -use runtime_primitives::generic::BlockId; -use runtime_primitives::traits::Block as BlockT; +use sr_primitives::generic::BlockId; +use sr_primitives::traits::Block as BlockT; /// helper to test the `leaves` implementation for various backends pub fn test_leaves_for_backend(backend: Arc) where diff --git a/substrate/core/test-runtime/src/genesismap.rs b/substrate/core/test-runtime/src/genesismap.rs index 8e0a423c92..da7d9cf4ef 100644 --- a/substrate/core/test-runtime/src/genesismap.rs +++ b/substrate/core/test-runtime/src/genesismap.rs @@ -21,7 +21,7 @@ use runtime_io::{blake2_256, twox_128}; use super::{AuthorityId, AccountId, WASM_BINARY}; use parity_codec::{Encode, KeyedVec, Joiner}; use primitives::{ChangesTrieConfiguration, map, storage::well_known_keys}; -use runtime_primitives::traits::Block; +use sr_primitives::traits::Block; /// Configuration of a general Substrate test genesis block. pub struct GenesisConfig { diff --git a/substrate/core/test-runtime/src/lib.rs b/substrate/core/test-runtime/src/lib.rs index d4c1620863..c529fa201f 100644 --- a/substrate/core/test-runtime/src/lib.rs +++ b/substrate/core/test-runtime/src/lib.rs @@ -33,7 +33,7 @@ use substrate_client::{ runtime_api as client_api, block_builder::api as block_builder_api, decl_runtime_apis, impl_runtime_apis, }; -use runtime_primitives::{ +use sr_primitives::{ ApplyResult, create_runtime_str, Perbill, transaction_validity::{TransactionValidity, ValidTransaction}, traits::{ @@ -125,13 +125,13 @@ impl BlindCheckable for Extrinsic { match self { Extrinsic::AuthoritiesChange(new_auth) => Ok(Extrinsic::AuthoritiesChange(new_auth)), Extrinsic::Transfer(transfer, signature) => { - if runtime_primitives::verify_encoded_lazy(&signature, &transfer, &transfer.from) { + if sr_primitives::verify_encoded_lazy(&signature, &transfer, &transfer.from) { Ok(Extrinsic::Transfer(transfer, signature)) } else { - Err(runtime_primitives::BAD_SIGNATURE) + Err(sr_primitives::BAD_SIGNATURE) } }, - Extrinsic::IncludeData(_) => Err(runtime_primitives::BAD_SIGNATURE), + Extrinsic::IncludeData(_) => Err(sr_primitives::BAD_SIGNATURE), Extrinsic::StorageChange(key, value) => Ok(Extrinsic::StorageChange(key, value)), } } @@ -173,13 +173,13 @@ pub type BlockNumber = u64; /// Index of a transaction. pub type Index = u64; /// The item of a block digest. -pub type DigestItem = runtime_primitives::generic::DigestItem; +pub type DigestItem = sr_primitives::generic::DigestItem; /// The digest of a block. -pub type Digest = runtime_primitives::generic::Digest; +pub type Digest = sr_primitives::generic::Digest; /// A test block. -pub type Block = runtime_primitives::generic::Block; +pub type Block = sr_primitives::generic::Block; /// A test block's header. -pub type Header = runtime_primitives::generic::Header; +pub type Header = sr_primitives::generic::Header; /// Run whatever tests we have. pub fn run_tests(mut input: &[u8]) -> Vec { @@ -775,7 +775,7 @@ mod tests { DefaultTestClientBuilderExt, TestClientBuilder, runtime::TestAPI, }; - use runtime_primitives::{ + use sr_primitives::{ generic::BlockId, traits::ProvideRuntimeApi, }; diff --git a/substrate/core/test-runtime/src/system.rs b/substrate/core/test-runtime/src/system.rs index 926f2f5410..30cd105328 100644 --- a/substrate/core/test-runtime/src/system.rs +++ b/substrate/core/test-runtime/src/system.rs @@ -21,10 +21,10 @@ use rstd::prelude::*; use runtime_io::{storage_root, enumerated_trie_root, storage_changes_root, twox_128, blake2_256}; use runtime_support::storage::{self, StorageValue, StorageMap}; use runtime_support::storage_items; -use runtime_primitives::traits::{Hash as HashT, BlakeTwo256, Header as _}; -use runtime_primitives::generic; -use runtime_primitives::{ApplyError, ApplyOutcome, ApplyResult}; -use runtime_primitives::transaction_validity::{TransactionValidity, ValidTransaction}; +use sr_primitives::traits::{Hash as HashT, BlakeTwo256, Header as _}; +use sr_primitives::generic; +use sr_primitives::{ApplyError, ApplyOutcome, ApplyResult}; +use sr_primitives::transaction_validity::{TransactionValidity, ValidTransaction}; use parity_codec::{KeyedVec, Encode}; use super::{ AccountId, BlockNumber, Extrinsic, Transfer, H256 as Hash, Block, Header, Digest, AuthorityId @@ -232,7 +232,7 @@ pub fn finalize_block() -> Header { #[inline(always)] fn check_signature(utx: &Extrinsic) -> Result<(), ApplyError> { - use runtime_primitives::traits::BlindCheckable; + use sr_primitives::traits::BlindCheckable; utx.clone().check().map_err(|_| ApplyError::BadSignature)?; Ok(()) } diff --git a/substrate/core/transaction-pool/Cargo.toml b/substrate/core/transaction-pool/Cargo.toml index 2e4f32197b..6d2465922b 100644 --- a/substrate/core/transaction-pool/Cargo.toml +++ b/substrate/core/transaction-pool/Cargo.toml @@ -12,7 +12,7 @@ parity-codec = "4.1.1" parking_lot = "0.8.0" sr-primitives = { path = "../sr-primitives" } client = { package = "substrate-client", path = "../client" } -substrate-primitives = { path = "../primitives" } +primitives = { package = "substrate-primitives", path = "../primitives" } txpool = { package = "substrate-transaction-graph", path = "./graph" } [dev-dependencies] diff --git a/substrate/core/transaction-pool/graph/Cargo.toml b/substrate/core/transaction-pool/graph/Cargo.toml index 951a595810..2ecb6ab188 100644 --- a/substrate/core/transaction-pool/graph/Cargo.toml +++ b/substrate/core/transaction-pool/graph/Cargo.toml @@ -10,7 +10,7 @@ futures = "0.1" log = "0.4" parking_lot = "0.8.0" serde = { version = "1.0", features = ["derive"] } -substrate-primitives = { path = "../../primitives" } +primitives = { package = "substrate-primitives", path = "../../primitives" } sr-primitives = { path = "../../sr-primitives" } [dev-dependencies] diff --git a/substrate/core/transaction-pool/graph/src/base_pool.rs b/substrate/core/transaction-pool/graph/src/base_pool.rs index b3a2cf0e54..cb37aee07f 100644 --- a/substrate/core/transaction-pool/graph/src/base_pool.rs +++ b/substrate/core/transaction-pool/graph/src/base_pool.rs @@ -27,7 +27,7 @@ use std::{ use log::{trace, debug, warn}; use serde::Serialize; -use substrate_primitives::hexdisplay::HexDisplay; +use primitives::hexdisplay::HexDisplay; use sr_primitives::traits::Member; use sr_primitives::transaction_validity::{ TransactionTag as Tag, diff --git a/substrate/core/transaction-pool/graph/src/future.rs b/substrate/core/transaction-pool/graph/src/future.rs index 6ca5019e47..c7b13c912d 100644 --- a/substrate/core/transaction-pool/graph/src/future.rs +++ b/substrate/core/transaction-pool/graph/src/future.rs @@ -22,7 +22,7 @@ use std::{ time, }; -use substrate_primitives::hexdisplay::HexDisplay; +use primitives::hexdisplay::HexDisplay; use sr_primitives::transaction_validity::{ TransactionTag as Tag, }; diff --git a/substrate/core/transaction-pool/src/api.rs b/substrate/core/transaction-pool/src/api.rs index 84475376fe..668a9b8013 100644 --- a/substrate/core/transaction-pool/src/api.rs +++ b/substrate/core/transaction-pool/src/api.rs @@ -23,7 +23,7 @@ use std::{ use client::{runtime_api::TaggedTransactionQueue, blockchain::HeaderBackend}; use parity_codec::Encode; use txpool; -use substrate_primitives::{ +use primitives::{ H256, Blake2Hasher, Hasher, diff --git a/substrate/core/trie/Cargo.toml b/substrate/core/trie/Cargo.toml index ef00e52eda..d2ba352257 100644 --- a/substrate/core/trie/Cargo.toml +++ b/substrate/core/trie/Cargo.toml @@ -18,7 +18,7 @@ hash-db = { version = "0.14.0", default-features = false } trie-db = { version = "0.14.0", default-features = false } trie-root = { version = "0.14.0", default-features = false } memory-db = { version = "0.14.0", default-features = false } -substrate-primitives = { path = "../primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../primitives", default-features = false } [dev-dependencies] trie-bench = { version = "0.14.0" } @@ -36,5 +36,5 @@ std = [ "memory-db/std", "trie-db/std", "trie-root/std", - "substrate-primitives/std", + "primitives/std", ] diff --git a/substrate/core/trie/benches/bench.rs b/substrate/core/trie/benches/bench.rs index 179dc6aaf8..176bf5971e 100644 --- a/substrate/core/trie/benches/bench.rs +++ b/substrate/core/trie/benches/bench.rs @@ -20,8 +20,8 @@ criterion_main!(benches); fn benchmark(c: &mut Criterion) { trie_bench::standard_benchmark::< - substrate_primitives::Blake2Hasher, - substrate_trie::NodeCodec, + primitives::Blake2Hasher, + substrate_trie::NodeCodec, substrate_trie::TrieStream, >(c, "substrate-blake2"); trie_bench::standard_benchmark::< diff --git a/substrate/core/trie/src/lib.rs b/substrate/core/trie/src/lib.rs index fe45c4aaf1..6e8adb4941 100644 --- a/substrate/core/trie/src/lib.rs +++ b/substrate/core/trie/src/lib.rs @@ -144,7 +144,7 @@ where /// /// `child_trie_root` and `child_delta_trie_root` can panic if invalid value is provided to them. pub fn is_child_trie_key_valid(storage_key: &[u8]) -> bool { - use substrate_primitives::storage::well_known_keys; + use primitives::storage::well_known_keys; let has_right_prefix = storage_key.starts_with(b":child_storage:default:"); if has_right_prefix { // This is an attempt to catch a change of `is_child_storage_key`, which @@ -332,7 +332,7 @@ fn branch_node(has_value: bool, has_children: impl Iterator) -> [u8 mod tests { use super::*; use codec::{Encode, Compact}; - use substrate_primitives::Blake2Hasher; + use primitives::Blake2Hasher; use hash_db::{HashDB, Hasher}; use trie_db::{DBValue, TrieMut, Trie}; use trie_standardmap::{Alphabet, ValueMode, StandardMap}; diff --git a/substrate/node/executor/Cargo.toml b/substrate/node/executor/Cargo.toml index 2e3ba49d98..1849e1eeed 100644 --- a/substrate/node/executor/Cargo.toml +++ b/substrate/node/executor/Cargo.toml @@ -19,7 +19,7 @@ node-runtime = { path = "../runtime" } [dev-dependencies] test-client = { package = "substrate-test-client", path = "../../core/test-client" } keyring = { package = "substrate-keyring", path = "../../core/keyring" } -runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives" } +sr-primitives = { path = "../../core/sr-primitives" } runtime_support = { package = "srml-support", path = "../../srml/support" } balances = { package = "srml-balances", path = "../../srml/balances" } session = { package = "srml-session", path = "../../srml/session" } diff --git a/substrate/node/executor/src/lib.rs b/substrate/node/executor/src/lib.rs index 6eba1022b2..fa3a5b08bd 100644 --- a/substrate/node/executor/src/lib.rs +++ b/substrate/node/executor/src/lib.rs @@ -46,9 +46,9 @@ mod tests { use state_machine::{CodeExecutor, Externalities, TestExternalities as CoreTestExternalities}; use primitives::{ twox_128, blake2_256, Blake2Hasher, ChangesTrieConfiguration, NeverNativeValue, NativeOrEncoded}; use node_primitives::{Hash, BlockNumber, AccountId, Balance, Index}; - use runtime_primitives::traits::{Header as HeaderT, Hash as HashT, Convert}; - use runtime_primitives::{generic::Era, ApplyOutcome, ApplyError, ApplyResult, Perbill}; - use runtime_primitives::weights::{WeightMultiplier, GetDispatchInfo}; + use sr_primitives::traits::{Header as HeaderT, Hash as HashT, Convert}; + use sr_primitives::{generic::Era, ApplyOutcome, ApplyError, ApplyResult, Perbill}; + use sr_primitives::weights::{WeightMultiplier, GetDispatchInfo}; use contracts::ContractAddressFor; use system::{EventRecord, Phase}; use node_runtime::{ diff --git a/substrate/node/primitives/Cargo.toml b/substrate/node/primitives/Cargo.toml index c4be1ef6f2..36ea1eb414 100644 --- a/substrate/node/primitives/Cargo.toml +++ b/substrate/node/primitives/Cargo.toml @@ -9,7 +9,7 @@ serde = { version = "1.0", optional = true, features = ["derive"] } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } [dev-dependencies] substrate-serializer = { path = "../../core/serializer" } @@ -21,6 +21,6 @@ std = [ "parity-codec/std", "primitives/std", "rstd/std", - "runtime_primitives/std", + "sr-primitives/std", "serde", ] diff --git a/substrate/node/primitives/src/lib.rs b/substrate/node/primitives/src/lib.rs index 96085cf60f..0895a8675d 100644 --- a/substrate/node/primitives/src/lib.rs +++ b/substrate/node/primitives/src/lib.rs @@ -20,7 +20,7 @@ #![cfg_attr(not(feature = "std"), no_std)] -use runtime_primitives::{ +use sr_primitives::{ generic, traits::{Verify, BlakeTwo256}, OpaqueExtrinsic, AnySignature }; diff --git a/substrate/node/runtime/Cargo.toml b/substrate/node/runtime/Cargo.toml index 9c52125fe8..c40e6d7796 100644 --- a/substrate/node/runtime/Cargo.toml +++ b/substrate/node/runtime/Cargo.toml @@ -9,10 +9,10 @@ build = "build.rs" integer-sqrt = { version = "0.1.2" } safe-mix = { version = "1.0", default-features = false } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } -substrate-primitives = { path = "../../core/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } client = { package = "substrate-client", path = "../../core/client", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } offchain-primitives = { package = "substrate-offchain-primitives", path = "../../core/offchain/primitives", default-features = false } version = { package = "sr-version", path = "../../core/sr-version", default-features = false } support = { package = "srml-support", path = "../../srml/support", default-features = false } @@ -51,9 +51,9 @@ no_std = [ ] std = [ "parity-codec/std", - "substrate-primitives/std", + "primitives/std", "rstd/std", - "runtime_primitives/std", + "sr-primitives/std", "support/std", "authorship/std", "babe/std", diff --git a/substrate/node/runtime/src/constants.rs b/substrate/node/runtime/src/constants.rs index 5c149b6d14..5443c7e636 100644 --- a/substrate/node/runtime/src/constants.rs +++ b/substrate/node/runtime/src/constants.rs @@ -68,7 +68,7 @@ pub mod time { // the ratio that `system` module uses to find normal transaction quota. /// Fee-related. pub mod fee { - pub use runtime_primitives::Perbill; + pub use sr_primitives::Perbill; /// The block saturation level. Fees will be updates based on this value. pub const TARGET_BLOCK_FULLNESS: Perbill = Perbill::from_percent(25); diff --git a/substrate/node/runtime/src/impls.rs b/substrate/node/runtime/src/impls.rs index 464f1a424b..2e1fcc8826 100644 --- a/substrate/node/runtime/src/impls.rs +++ b/substrate/node/runtime/src/impls.rs @@ -17,9 +17,9 @@ //! Some configurable implementations as associated type for the substrate runtime. use node_primitives::Balance; -use runtime_primitives::weights::{Weight, WeightMultiplier}; -use runtime_primitives::traits::{Convert, Saturating}; -use runtime_primitives::Fixed64; +use sr_primitives::weights::{Weight, WeightMultiplier}; +use sr_primitives::traits::{Convert, Saturating}; +use sr_primitives::Fixed64; use support::traits::{OnUnbalanced, Currency}; use crate::{Balances, Authorship, MaximumBlockWeight, NegativeImbalance}; use crate::constants::fee::TARGET_BLOCK_FULLNESS; @@ -131,8 +131,8 @@ impl Convert<(Weight, WeightMultiplier), WeightMultiplier> for WeightMultiplierU #[cfg(test)] mod tests { use super::*; - use runtime_primitives::weights::Weight; - use runtime_primitives::Perbill; + use sr_primitives::weights::Weight; + use sr_primitives::Perbill; use crate::{MaximumBlockWeight, AvailableBlockRatio, Runtime}; use crate::constants::currency::*; diff --git a/substrate/node/runtime/src/lib.rs b/substrate/node/runtime/src/lib.rs index f89b121afa..583496508e 100644 --- a/substrate/node/runtime/src/lib.rs +++ b/substrate/node/runtime/src/lib.rs @@ -24,7 +24,7 @@ use rstd::prelude::*; use support::{ construct_runtime, parameter_types, traits::{SplitTwoWays, Currency} }; -use substrate_primitives::u32_trait::{_1, _2, _3, _4}; +use primitives::u32_trait::{_1, _2, _3, _4}; use node_primitives::{ AccountId, AccountIndex, Balance, BlockNumber, Hash, Index, Moment, Signature, @@ -35,26 +35,26 @@ use client::{ block_builder::api::{self as block_builder_api, InherentData, CheckInherentsResult}, runtime_api as client_api, impl_runtime_apis }; -use runtime_primitives::{ApplyResult, impl_opaque_keys, generic, create_runtime_str, key_types}; -use runtime_primitives::transaction_validity::TransactionValidity; -use runtime_primitives::weights::Weight; -use runtime_primitives::traits::{ +use sr_primitives::{ApplyResult, impl_opaque_keys, generic, create_runtime_str, key_types}; +use sr_primitives::transaction_validity::TransactionValidity; +use sr_primitives::weights::Weight; +use sr_primitives::traits::{ BlakeTwo256, Block as BlockT, DigestFor, NumberFor, StaticLookup, }; use version::RuntimeVersion; use elections::VoteIndex; #[cfg(any(feature = "std", test))] use version::NativeVersion; -use substrate_primitives::OpaqueMetadata; +use primitives::OpaqueMetadata; use grandpa::{AuthorityId as GrandpaId, AuthorityWeight as GrandpaWeight}; use finality_tracker::{DEFAULT_REPORT_LATENCY, DEFAULT_WINDOW_SIZE}; #[cfg(any(feature = "std", test))] -pub use runtime_primitives::BuildStorage; +pub use sr_primitives::BuildStorage; pub use timestamp::Call as TimestampCall; pub use balances::Call as BalancesCall; pub use contracts::Gas; -pub use runtime_primitives::{Permill, Perbill}; +pub use sr_primitives::{Permill, Perbill}; pub use support::StorageValue; pub use staking::StakerStatus; diff --git a/substrate/srml/assets/Cargo.toml b/substrate/srml/assets/Cargo.toml index 977248a7a7..d1526c8be8 100644 --- a/substrate/srml/assets/Cargo.toml +++ b/substrate/srml/assets/Cargo.toml @@ -8,14 +8,14 @@ edition = "2018" serde = { version = "1.0", optional = true } parity-codec = { version = "4.1.1", default-features = false } # Needed for various traits. In our case, `OnFinalize`. -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } # Needed for type-safe access to storage DB. srml-support = { path = "../support", default-features = false } # `system` module provides us with all sorts of useful stuff and macros depend on it being around. system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } sr-std = { path = "../../core/sr-std" } runtime_io = { package = "sr-io", path = "../../core/sr-io" } @@ -24,7 +24,7 @@ default = ["std"] std = [ "serde", "parity-codec/std", - "primitives/std", + "sr-primitives/std", "srml-support/std", "system/std", ] diff --git a/substrate/srml/assets/src/lib.rs b/substrate/srml/assets/src/lib.rs index 6dc5f321e4..363e1c351c 100644 --- a/substrate/srml/assets/src/lib.rs +++ b/substrate/srml/assets/src/lib.rs @@ -131,9 +131,9 @@ #![cfg_attr(not(feature = "std"), no_std)] use srml_support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage, ensure}; -use primitives::traits::{Member, SimpleArithmetic, Zero, StaticLookup}; +use sr_primitives::traits::{Member, SimpleArithmetic, Zero, StaticLookup}; use system::ensure_signed; -use primitives::traits::One; +use sr_primitives::traits::One; /// The module configuration trait. pub trait Trait: system::Trait { @@ -241,10 +241,10 @@ mod tests { use runtime_io::with_externalities; use srml_support::{impl_outer_origin, assert_ok, assert_noop, parameter_types}; - use substrate_primitives::{H256, Blake2Hasher}; + use primitives::{H256, Blake2Hasher}; // The testing primitives are very useful for avoiding having to work with signatures // or public keys. `u64` is used as the `AccountId` and no `Signature`s are required. - use primitives::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header}; + use sr_primitives::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header}; impl_outer_origin! { pub enum Origin for Test {} diff --git a/substrate/srml/aura/Cargo.toml b/substrate/srml/aura/Cargo.toml index c1bf922a58..9ce3658283 100644 --- a/substrate/srml/aura/Cargo.toml +++ b/substrate/srml/aura/Cargo.toml @@ -9,8 +9,8 @@ parity-codec = { version = "4.1.1", default-features = false, features = ["deriv serde = { version = "1.0", optional = true } inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } -substrate-primitives = { path = "../../core/primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } @@ -30,8 +30,8 @@ std = [ "parity-codec/std", "rstd/std", "srml-support/std", + "sr-primitives/std", "primitives/std", - "substrate-primitives/std", "system/std", "timestamp/std", "staking/std", diff --git a/substrate/srml/aura/src/lib.rs b/substrate/srml/aura/src/lib.rs index a0f7ad6242..1402cb1d9e 100644 --- a/substrate/srml/aura/src/lib.rs +++ b/substrate/srml/aura/src/lib.rs @@ -53,7 +53,7 @@ pub use timestamp; use rstd::{result, prelude::*}; use parity_codec::Encode; use srml_support::{decl_storage, decl_module, Parameter, storage::StorageValue, traits::Get}; -use primitives::{ +use sr_primitives::{ traits::{SaturatedConversion, Saturating, Zero, One, Member, IsMember, TypedKey}, generic::DigestItem, }; diff --git a/substrate/srml/aura/src/mock.rs b/substrate/srml/aura/src/mock.rs index 42f06b564f..f00e090b68 100644 --- a/substrate/srml/aura/src/mock.rs +++ b/substrate/srml/aura/src/mock.rs @@ -18,13 +18,13 @@ #![cfg(test)] -use primitives::{ +use sr_primitives::{ traits::IdentityLookup, Perbill, testing::{Header, UintAuthorityId}, }; use srml_support::{impl_outer_origin, parameter_types}; use runtime_io; -use substrate_primitives::{H256, Blake2Hasher}; +use primitives::{H256, Blake2Hasher}; use crate::{Trait, Module, GenesisConfig}; impl_outer_origin!{ @@ -48,7 +48,7 @@ impl system::Trait for Test { type Index = u64; type BlockNumber = u64; type Hash = H256; - type Hashing = ::primitives::traits::BlakeTwo256; + type Hashing = ::sr_primitives::traits::BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; diff --git a/substrate/srml/aura/src/tests.rs b/substrate/srml/aura/src/tests.rs index 3e20613c48..12deeb99a8 100644 --- a/substrate/srml/aura/src/tests.rs +++ b/substrate/srml/aura/src/tests.rs @@ -20,7 +20,7 @@ use lazy_static::lazy_static; use crate::mock::{System, Aura, new_test_ext}; -use primitives::traits::Header; +use sr_primitives::traits::Header; use runtime_io::with_externalities; use parking_lot::Mutex; use crate::{AuraReport, HandleReport}; diff --git a/substrate/srml/authorship/Cargo.toml b/substrate/srml/authorship/Cargo.toml index 0cf2f1e256..29de88ba2c 100644 --- a/substrate/srml/authorship/Cargo.toml +++ b/substrate/srml/authorship/Cargo.toml @@ -6,10 +6,10 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -substrate-primitives = { path = "../../core/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } @@ -18,10 +18,10 @@ runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = default = ["std"] std = [ "parity-codec/std", - "substrate-primitives/std", + "primitives/std", + "sr-primitives/std", "rstd/std", "srml-support/std", - "primitives/std", "system/std", "runtime_io/std", ] diff --git a/substrate/srml/authorship/src/lib.rs b/substrate/srml/authorship/src/lib.rs index 39a3e8000a..2325dac5f3 100644 --- a/substrate/srml/authorship/src/lib.rs +++ b/substrate/srml/authorship/src/lib.rs @@ -27,8 +27,8 @@ use srml_support::traits::{FindAuthor, VerifySeal, Get}; use srml_support::dispatch::Result as DispatchResult; use parity_codec::{Encode, Decode}; use system::ensure_none; -use primitives::traits::{SimpleArithmetic, Header as HeaderT, One, Zero}; -use primitives::weights::SimpleDispatchInfo; +use sr_primitives::traits::{SimpleArithmetic, Header as HeaderT, One, Zero}; +use sr_primitives::weights::SimpleDispatchInfo; pub trait Trait: system::Trait { /// Find the author of a block. @@ -324,11 +324,11 @@ impl Module { mod tests { use super::*; use runtime_io::with_externalities; - use substrate_primitives::{H256, Blake2Hasher}; - use primitives::traits::{BlakeTwo256, IdentityLookup}; - use primitives::testing::Header; - use primitives::generic::DigestItem; - use primitives::Perbill; + use primitives::{H256, Blake2Hasher}; + use sr_primitives::traits::{BlakeTwo256, IdentityLookup}; + use sr_primitives::testing::Header; + use sr_primitives::generic::DigestItem; + use sr_primitives::Perbill; use srml_support::{parameter_types, impl_outer_origin, ConsensusEngineId}; impl_outer_origin!{ diff --git a/substrate/srml/babe/Cargo.toml b/substrate/srml/babe/Cargo.toml index 7922c1dfe7..ba47d8e278 100644 --- a/substrate/srml/babe/Cargo.toml +++ b/substrate/srml/babe/Cargo.toml @@ -10,7 +10,7 @@ parity-codec = { version = "4.1.1", default-features = false, features = ["deriv serde = { version = "1.0.93", optional = true } inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } staking = { package = "srml-staking", path = "../staking", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } @@ -22,7 +22,7 @@ runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = [dev-dependencies] lazy_static = "1.3.0" parking_lot = "0.8.0" -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } [features] default = ["std"] @@ -31,7 +31,7 @@ std = [ "parity-codec/std", "rstd/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", "system/std", "timestamp/std", "inherents/std", diff --git a/substrate/srml/babe/src/lib.rs b/substrate/srml/babe/src/lib.rs index c75869ab57..2dbb9222fb 100644 --- a/substrate/srml/babe/src/lib.rs +++ b/substrate/srml/babe/src/lib.rs @@ -24,8 +24,8 @@ pub use timestamp; use rstd::{result, prelude::*}; use srml_support::{decl_storage, decl_module, StorageValue, traits::FindAuthor, traits::Get}; use timestamp::{OnTimestampSet}; -use primitives::{generic::DigestItem, ConsensusEngineId}; -use primitives::traits::{IsMember, SaturatedConversion, Saturating, RandomnessBeacon, Convert}; +use sr_primitives::{generic::DigestItem, ConsensusEngineId}; +use sr_primitives::traits::{IsMember, SaturatedConversion, Saturating, RandomnessBeacon, Convert}; #[cfg(feature = "std")] use timestamp::TimestampInherentData; use parity_codec::{Encode, Decode}; diff --git a/substrate/srml/balances/Cargo.toml b/substrate/srml/balances/Cargo.toml index cc8f442e04..f096d506a4 100644 --- a/substrate/srml/balances/Cargo.toml +++ b/substrate/srml/balances/Cargo.toml @@ -10,13 +10,13 @@ safe-mix = { version = "1.0", default-features = false} parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } substrate-keyring = { path = "../../core/keyring", optional = true } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } [features] default = ["std"] @@ -27,6 +27,6 @@ std = [ "parity-codec/std", "rstd/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", "system/std", ] diff --git a/substrate/srml/balances/src/lib.rs b/substrate/srml/balances/src/lib.rs index cde3fa2d16..bff5e90c32 100644 --- a/substrate/srml/balances/src/lib.rs +++ b/substrate/srml/balances/src/lib.rs @@ -112,7 +112,7 @@ //! //! ``` //! use srml_support::traits::{WithdrawReasons, LockableCurrency}; -//! use primitives::traits::Bounded; +//! use sr_primitives::traits::Bounded; //! pub trait Trait: system::Trait { //! type Currency: LockableCurrency; //! } @@ -159,12 +159,12 @@ use srml_support::traits::{ Imbalance, SignedImbalance, ReservableCurrency, Get, }; use srml_support::dispatch::Result; -use primitives::traits::{ +use sr_primitives::traits::{ Zero, SimpleArithmetic, StaticLookup, Member, CheckedAdd, CheckedSub, MaybeSerializeDebug, Saturating, Bounded, SignedExtension, SaturatedConversion, DispatchError, Convert, }; -use primitives::transaction_validity::{TransactionPriority, ValidTransaction}; -use primitives::weights::{DispatchInfo, SimpleDispatchInfo, Weight}; +use sr_primitives::transaction_validity::{TransactionPriority, ValidTransaction}; +use sr_primitives::weights::{DispatchInfo, SimpleDispatchInfo, Weight}; use system::{IsDeadAccount, OnNewAccount, ensure_signed, ensure_root}; mod mock; @@ -344,7 +344,7 @@ decl_storage! { // Total genesis `balance` minus `liquid` equals funds locked for vesting let locked = balance.saturating_sub(liquid); // Number of units unlocked per block after `begin` - let per_block = locked / length.max(primitives::traits::One::one()); + let per_block = locked / length.max(sr_primitives::traits::One::one()); (who.clone(), VestingSchedule { locked: locked, diff --git a/substrate/srml/balances/src/mock.rs b/substrate/srml/balances/src/mock.rs index 116515c368..2c84bb9afb 100644 --- a/substrate/srml/balances/src/mock.rs +++ b/substrate/srml/balances/src/mock.rs @@ -18,8 +18,8 @@ #![cfg(test)] -use primitives::{Perbill, traits::{Convert, IdentityLookup}, testing::Header, weights::{DispatchInfo, Weight}}; -use substrate_primitives::{H256, Blake2Hasher}; +use sr_primitives::{Perbill, traits::{Convert, IdentityLookup}, testing::Header, weights::{DispatchInfo, Weight}}; +use primitives::{H256, Blake2Hasher}; use runtime_io; use srml_support::{impl_outer_origin, parameter_types}; use srml_support::traits::Get; @@ -86,7 +86,7 @@ impl system::Trait for Runtime { type Index = u64; type BlockNumber = u64; type Hash = H256; - type Hashing = ::primitives::traits::BlakeTwo256; + type Hashing = ::sr_primitives::traits::BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; diff --git a/substrate/srml/balances/src/tests.rs b/substrate/srml/balances/src/tests.rs index 595be0e1ca..5a977747fe 100644 --- a/substrate/srml/balances/src/tests.rs +++ b/substrate/srml/balances/src/tests.rs @@ -774,7 +774,7 @@ fn signed_extension_take_fees_is_bounded() { .monied(true) .build(), || { - use primitives::weights::Weight; + use sr_primitives::weights::Weight; // maximum weight possible assert!(TakeFees::::from(0).pre_dispatch(&1, info_from_weight(Weight::max_value()), 10).is_ok()); diff --git a/substrate/srml/collective/Cargo.toml b/substrate/srml/collective/Cargo.toml index cd0bb17871..83d25593e4 100644 --- a/substrate/srml/collective/Cargo.toml +++ b/substrate/srml/collective/Cargo.toml @@ -8,10 +8,10 @@ edition = "2018" serde = { version = "1.0", optional = true } safe-mix = { version = "1.0", default-features = false} parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } -substrate-primitives = { path = "../../core/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } @@ -24,11 +24,11 @@ default = ["std"] std = [ "safe-mix/std", "parity-codec/std", - "substrate-primitives/std", + "primitives/std", "rstd/std", "serde", "runtime_io/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", "system/std", ] diff --git a/substrate/srml/collective/src/lib.rs b/substrate/srml/collective/src/lib.rs index b05b69db77..20c11bdf9b 100644 --- a/substrate/srml/collective/src/lib.rs +++ b/substrate/srml/collective/src/lib.rs @@ -21,9 +21,9 @@ #![recursion_limit="128"] use rstd::{prelude::*, result}; -use substrate_primitives::u32_trait::Value as U32; -use primitives::traits::{Hash, EnsureOrigin}; -use primitives::weights::SimpleDispatchInfo; +use primitives::u32_trait::Value as U32; +use sr_primitives::traits::{Hash, EnsureOrigin}; +use sr_primitives::weights::SimpleDispatchInfo; use srml_support::{ dispatch::{Dispatchable, Parameter}, codec::{Encode, Decode}, traits::ChangeMembers, StorageValue, StorageMap, decl_module, decl_event, decl_storage, ensure @@ -397,8 +397,8 @@ mod tests { use system::{EventRecord, Phase}; use hex_literal::hex; use runtime_io::with_externalities; - use substrate_primitives::{H256, Blake2Hasher}; - use primitives::{ + use primitives::{H256, Blake2Hasher}; + use sr_primitives::{ Perbill, traits::{BlakeTwo256, IdentityLookup, Block as BlockT}, testing::Header, BuildStorage }; use crate as collective; @@ -436,8 +436,8 @@ mod tests { type Event = Event; } - pub type Block = primitives::generic::Block; - pub type UncheckedExtrinsic = primitives::generic::UncheckedExtrinsic; + pub type Block = sr_primitives::generic::Block; + pub type UncheckedExtrinsic = sr_primitives::generic::UncheckedExtrinsic; srml_support::construct_runtime!( pub enum Test where diff --git a/substrate/srml/contracts/Cargo.toml b/substrate/srml/contracts/Cargo.toml index 19afc06406..33c32c8ea2 100644 --- a/substrate/srml/contracts/Cargo.toml +++ b/substrate/srml/contracts/Cargo.toml @@ -10,8 +10,8 @@ pwasm-utils = { version = "0.6.1", default-features = false } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } parity-wasm = { version = "0.31", default-features = false } wasmi-validation = { version = "0.1", default-features = false } -substrate-primitives = { path = "../../core/primitives", default-features = false } -runtime-primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } sandbox = { package = "sr-sandbox", path = "../../core/sr-sandbox", default-features = false } @@ -34,8 +34,8 @@ core = [ std = [ "serde", "parity-codec/std", - "substrate-primitives/std", - "runtime-primitives/std", + "primitives/std", + "sr-primitives/std", "runtime-io/std", "rstd/std", "sandbox/std", diff --git a/substrate/srml/contracts/src/account_db.rs b/substrate/srml/contracts/src/account_db.rs index f912266415..5cfd0d3a65 100644 --- a/substrate/srml/contracts/src/account_db.rs +++ b/substrate/srml/contracts/src/account_db.rs @@ -25,7 +25,7 @@ use rstd::cell::RefCell; use rstd::collections::btree_map::{BTreeMap, Entry}; use rstd::prelude::*; use runtime_io::blake2_256; -use runtime_primitives::traits::{Bounded, Zero}; +use sr_primitives::traits::{Bounded, Zero}; use srml_support::traits::{Currency, Get, Imbalance, SignedImbalance, UpdateBalanceOutcome}; use srml_support::{storage::child, StorageMap}; use system; diff --git a/substrate/srml/contracts/src/exec.rs b/substrate/srml/contracts/src/exec.rs index a8219d7902..084558e76f 100644 --- a/substrate/srml/contracts/src/exec.rs +++ b/substrate/srml/contracts/src/exec.rs @@ -21,7 +21,7 @@ use crate::gas::{Gas, GasMeter, Token, approx_gas_for_balance}; use crate::rent; use rstd::prelude::*; -use runtime_primitives::traits::{Bounded, CheckedAdd, CheckedSub, Zero}; +use sr_primitives::traits::{Bounded, CheckedAdd, CheckedSub, Zero}; use srml_support::traits::{WithdrawReason, Currency}; use timestamp; diff --git a/substrate/srml/contracts/src/gas.rs b/substrate/srml/contracts/src/gas.rs index 44d5b32fd9..a5811e81a0 100644 --- a/substrate/srml/contracts/src/gas.rs +++ b/substrate/srml/contracts/src/gas.rs @@ -16,8 +16,8 @@ use crate::{GasSpent, Module, Trait, BalanceOf, NegativeImbalanceOf}; use rstd::convert::TryFrom; -use runtime_primitives::BLOCK_FULL; -use runtime_primitives::traits::{CheckedMul, Zero, SaturatedConversion, SimpleArithmetic, UniqueSaturatedInto}; +use sr_primitives::BLOCK_FULL; +use sr_primitives::traits::{CheckedMul, Zero, SaturatedConversion, SimpleArithmetic, UniqueSaturatedInto}; use srml_support::StorageValue; use srml_support::traits::{Currency, ExistenceRequirement, Get, Imbalance, OnUnbalanced, WithdrawReason}; diff --git a/substrate/srml/contracts/src/lib.rs b/substrate/srml/contracts/src/lib.rs index 43996524aa..c4e588e12e 100644 --- a/substrate/srml/contracts/src/lib.rs +++ b/substrate/srml/contracts/src/lib.rs @@ -96,11 +96,11 @@ use crate::wasm::{WasmLoader, WasmVm}; #[cfg(feature = "std")] use serde::{Serialize, Deserialize}; -use substrate_primitives::crypto::UncheckedFrom; +use primitives::crypto::UncheckedFrom; use rstd::{prelude::*, marker::PhantomData}; use parity_codec::{Codec, Encode, Decode}; use runtime_io::blake2_256; -use runtime_primitives::traits::{ +use sr_primitives::traits::{ Hash, StaticLookup, Zero, MaybeSerializeDebug, Member }; use srml_support::dispatch::{Result, Dispatchable}; @@ -110,7 +110,7 @@ use srml_support::{ }; use srml_support::traits::{OnFreeBalanceZero, OnUnbalanced, Currency, Get}; use system::{ensure_signed, RawOrigin, ensure_root}; -use substrate_primitives::storage::well_known_keys::CHILD_STORAGE_KEY_PREFIX; +use primitives::storage::well_known_keys::CHILD_STORAGE_KEY_PREFIX; use timestamp; pub type CodeHash = ::Hash; diff --git a/substrate/srml/contracts/src/rent.rs b/substrate/srml/contracts/src/rent.rs index 96f8516a5f..fea6cdc7f3 100644 --- a/substrate/srml/contracts/src/rent.rs +++ b/substrate/srml/contracts/src/rent.rs @@ -15,7 +15,7 @@ // along with Substrate. If not, see . use crate::{BalanceOf, ContractInfo, ContractInfoOf, TombstoneContractInfo, Trait, AliveContractInfo}; -use runtime_primitives::traits::{Bounded, CheckedDiv, CheckedMul, Saturating, Zero, +use sr_primitives::traits::{Bounded, CheckedDiv, CheckedMul, Saturating, Zero, SaturatedConversion}; use srml_support::traits::{Currency, ExistenceRequirement, Get, WithdrawReason}; use srml_support::StorageMap; diff --git a/substrate/srml/contracts/src/tests.rs b/substrate/srml/contracts/src/tests.rs index db196ef7fe..f4699a8c1a 100644 --- a/substrate/srml/contracts/src/tests.rs +++ b/substrate/srml/contracts/src/tests.rs @@ -29,17 +29,17 @@ use hex_literal::*; use parity_codec::{Decode, Encode, KeyedVec}; use runtime_io; use runtime_io::with_externalities; -use runtime_primitives::testing::{Digest, DigestItem, Header, UintAuthorityId, H256}; -use runtime_primitives::traits::{BlakeTwo256, Hash, IdentityLookup}; -use runtime_primitives::{Perbill, BuildStorage}; +use sr_primitives::testing::{Digest, DigestItem, Header, UintAuthorityId, H256}; +use sr_primitives::traits::{BlakeTwo256, Hash, IdentityLookup}; +use sr_primitives::{Perbill, BuildStorage}; use srml_support::{ assert_ok, assert_err, impl_outer_dispatch, impl_outer_event, impl_outer_origin, parameter_types, storage::child, StorageMap, StorageValue, traits::{Currency, Get}, }; use std::cell::RefCell; use std::sync::atomic::{AtomicUsize, Ordering}; -use substrate_primitives::storage::well_known_keys; -use substrate_primitives::Blake2Hasher; +use primitives::storage::well_known_keys; +use primitives::Blake2Hasher; use system::{self, EventRecord, Phase}; use {balances, wabt}; @@ -196,7 +196,7 @@ impl ContractAddressFor for DummyContractAddressFor { pub struct DummyTrieIdGenerator; impl TrieIdGenerator for DummyTrieIdGenerator { fn trie_id(account_id: &u64) -> TrieId { - use substrate_primitives::storage::well_known_keys; + use primitives::storage::well_known_keys; let new_seed = super::AccountCounter::mutate(|v| { *v = v.wrapping_add(1); diff --git a/substrate/srml/contracts/src/wasm/code_cache.rs b/substrate/srml/contracts/src/wasm/code_cache.rs index 140878f28b..9e8fcab8c2 100644 --- a/substrate/srml/contracts/src/wasm/code_cache.rs +++ b/substrate/srml/contracts/src/wasm/code_cache.rs @@ -30,7 +30,7 @@ use crate::gas::{Gas, GasMeter, Token}; use crate::wasm::{prepare, runtime::Env, PrefabWasmModule}; use crate::{CodeHash, CodeStorage, PristineCode, Schedule, Trait}; use rstd::prelude::*; -use runtime_primitives::traits::{Hash, Bounded}; +use sr_primitives::traits::{Hash, Bounded}; use srml_support::StorageMap; /// Gas metering token that used for charging storing code into the code storage. diff --git a/substrate/srml/contracts/src/wasm/env_def/macros.rs b/substrate/srml/contracts/src/wasm/env_def/macros.rs index 4f8bce9904..af83c36623 100644 --- a/substrate/srml/contracts/src/wasm/env_def/macros.rs +++ b/substrate/srml/contracts/src/wasm/env_def/macros.rs @@ -195,7 +195,7 @@ macro_rules! define_env { mod tests { use parity_wasm::elements::FunctionType; use parity_wasm::elements::ValueType; - use runtime_primitives::traits::Zero; + use sr_primitives::traits::Zero; use sandbox::{self, ReturnValue, TypedValue}; use crate::wasm::tests::MockExt; use crate::wasm::Runtime; diff --git a/substrate/srml/contracts/src/wasm/mod.rs b/substrate/srml/contracts/src/wasm/mod.rs index 9a0ca1056e..c832d324b3 100644 --- a/substrate/srml/contracts/src/wasm/mod.rs +++ b/substrate/srml/contracts/src/wasm/mod.rs @@ -173,7 +173,7 @@ impl<'a, T: Trait> crate::exec::Vm for WasmVm<'a> { mod tests { use super::*; use std::collections::HashMap; - use substrate_primitives::H256; + use primitives::H256; use crate::exec::{CallReceipt, Ext, InstantiateReceipt, EmptyOutputBuf, StorageKey}; use crate::gas::{Gas, GasMeter}; use crate::tests::{Test, Call}; diff --git a/substrate/srml/contracts/src/wasm/prepare.rs b/substrate/srml/contracts/src/wasm/prepare.rs index c135c45d3a..4539b9d388 100644 --- a/substrate/srml/contracts/src/wasm/prepare.rs +++ b/substrate/srml/contracts/src/wasm/prepare.rs @@ -26,7 +26,7 @@ use parity_wasm::elements::{self, Internal, External, MemoryType, Type}; use pwasm_utils; use pwasm_utils::rules; use rstd::prelude::*; -use runtime_primitives::traits::{SaturatedConversion}; +use sr_primitives::traits::{SaturatedConversion}; struct ContractModule<'a> { /// A deserialized module. The module is valid (this is Guaranteed by `new` method). diff --git a/substrate/srml/contracts/src/wasm/runtime.rs b/substrate/srml/contracts/src/wasm/runtime.rs index 92d9b98acf..556aa829cd 100644 --- a/substrate/srml/contracts/src/wasm/runtime.rs +++ b/substrate/srml/contracts/src/wasm/runtime.rs @@ -27,7 +27,7 @@ use system; use rstd::prelude::*; use rstd::mem; use parity_codec::{Decode, Encode}; -use runtime_primitives::traits::{Bounded, SaturatedConversion}; +use sr_primitives::traits::{Bounded, SaturatedConversion}; /// Enumerates all possible *special* trap conditions. /// diff --git a/substrate/srml/council/src/lib.rs b/substrate/srml/council/src/lib.rs index 3fc9926942..6d2db9373d 100644 --- a/substrate/srml/council/src/lib.rs +++ b/substrate/srml/council/src/lib.rs @@ -41,10 +41,10 @@ mod tests { pub use runtime_io::with_externalities; use srml_support::{impl_outer_origin, impl_outer_event, impl_outer_dispatch, parameter_types}; use srml_support::traits::Get; - pub use substrate_primitives::{H256, Blake2Hasher, u32_trait::{_1, _2, _3, _4}}; - pub use primitives::traits::{BlakeTwo256, IdentityLookup}; - pub use primitives::testing::{Digest, DigestItem, Header}; - pub use primitives::Perbill; + pub use primitives::{H256, Blake2Hasher, u32_trait::{_1, _2, _3, _4}}; + pub use sr_primitives::traits::{BlakeTwo256, IdentityLookup}; + pub use sr_primitives::testing::{Digest, DigestItem, Header}; + pub use sr_primitives::Perbill; pub use {seats, motions}; use std::cell::RefCell; diff --git a/substrate/srml/democracy/Cargo.toml b/substrate/srml/democracy/Cargo.toml index e7b06ca597..baf1488d42 100644 --- a/substrate/srml/democracy/Cargo.toml +++ b/substrate/srml/democracy/Cargo.toml @@ -10,12 +10,12 @@ safe-mix = { version = "1.0", default-features = false} parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } balances = { package = "srml-balances", path = "../balances" } [features] @@ -27,6 +27,6 @@ std = [ "rstd/std", "runtime_io/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", "system/std", ] diff --git a/substrate/srml/democracy/src/lib.rs b/substrate/srml/democracy/src/lib.rs index 1736d8a97e..ae53a53bb8 100644 --- a/substrate/srml/democracy/src/lib.rs +++ b/substrate/srml/democracy/src/lib.rs @@ -20,8 +20,8 @@ use rstd::prelude::*; use rstd::{result, convert::TryFrom}; -use primitives::traits::{Zero, Bounded, CheckedMul, CheckedDiv, EnsureOrigin, Hash}; -use primitives::weights::SimpleDispatchInfo; +use sr_primitives::traits::{Zero, Bounded, CheckedMul, CheckedDiv, EnsureOrigin, Hash}; +use sr_primitives::weights::SimpleDispatchInfo; use parity_codec::{Encode, Decode, Input, Output}; use srml_support::{ decl_module, decl_storage, decl_event, ensure, @@ -990,9 +990,9 @@ mod tests { impl_outer_origin, impl_outer_dispatch, assert_noop, assert_ok, parameter_types, traits::Contains }; - use substrate_primitives::{H256, Blake2Hasher}; - use primitives::{traits::{BlakeTwo256, IdentityLookup, Bounded}, testing::Header}; - use primitives::Perbill; + use primitives::{H256, Blake2Hasher}; + use sr_primitives::{traits::{BlakeTwo256, IdentityLookup, Bounded}, testing::Header}; + use sr_primitives::Perbill; use balances::BalanceLock; use system::EnsureSignedBy; diff --git a/substrate/srml/democracy/src/vote_threshold.rs b/substrate/srml/democracy/src/vote_threshold.rs index ee42363d47..96e5849e43 100644 --- a/substrate/srml/democracy/src/vote_threshold.rs +++ b/substrate/srml/democracy/src/vote_threshold.rs @@ -19,7 +19,7 @@ #[cfg(feature = "std")] use serde::{Serialize, Deserialize}; use parity_codec::{Encode, Decode}; -use primitives::traits::{Zero, IntegerSquareRoot}; +use sr_primitives::traits::{Zero, IntegerSquareRoot}; use rstd::ops::{Add, Mul, Div, Rem}; /// A means of determining if a vote is past pass threshold. diff --git a/substrate/srml/elections/Cargo.toml b/substrate/srml/elections/Cargo.toml index cd0a43aeb5..dc004471d5 100644 --- a/substrate/srml/elections/Cargo.toml +++ b/substrate/srml/elections/Cargo.toml @@ -8,10 +8,10 @@ edition = "2018" serde = { version = "1.0", optional = true } safe-mix = { version = "1.0", default-features = false} parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } -substrate-primitives = { path = "../../core/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } @@ -24,11 +24,11 @@ default = ["std"] std = [ "safe-mix/std", "parity-codec/std", - "substrate-primitives/std", + "primitives/std", "rstd/std", "serde", "runtime_io/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", "system/std", ] diff --git a/substrate/srml/elections/src/lib.rs b/substrate/srml/elections/src/lib.rs index 8a681fa145..0e761c94c8 100644 --- a/substrate/srml/elections/src/lib.rs +++ b/substrate/srml/elections/src/lib.rs @@ -24,8 +24,8 @@ #![recursion_limit="128"] use rstd::prelude::*; -use primitives::traits::{Zero, One, StaticLookup, Bounded, Saturating}; -use primitives::weights::SimpleDispatchInfo; +use sr_primitives::traits::{Zero, One, StaticLookup, Bounded, Saturating}; +use sr_primitives::weights::SimpleDispatchInfo; use runtime_io::print; use srml_support::{ StorageValue, StorageMap, @@ -1116,8 +1116,8 @@ mod tests { use std::cell::RefCell; use srml_support::{assert_ok, assert_err, assert_noop, parameter_types}; use runtime_io::with_externalities; - use substrate_primitives::{H256, Blake2Hasher}; - use primitives::{ + use primitives::{H256, Blake2Hasher}; + use sr_primitives::{ Perbill, traits::{BlakeTwo256, IdentityLookup, Block as BlockT}, testing::Header, BuildStorage }; use crate as elections; @@ -1234,8 +1234,8 @@ mod tests { type DecayRatio = DecayRatio; } - pub type Block = primitives::generic::Block; - pub type UncheckedExtrinsic = primitives::generic::UncheckedExtrinsic; + pub type Block = sr_primitives::generic::Block; + pub type UncheckedExtrinsic = sr_primitives::generic::UncheckedExtrinsic; srml_support::construct_runtime!( pub enum Test where diff --git a/substrate/srml/example/Cargo.toml b/substrate/srml/example/Cargo.toml index f46ce54749..2cbd707f18 100644 --- a/substrate/srml/example/Cargo.toml +++ b/substrate/srml/example/Cargo.toml @@ -14,7 +14,7 @@ sr-primitives = { path = "../../core/sr-primitives", default-features = false } [dev-dependencies] sr-io = { path = "../../core/sr-io" } -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } [features] default = ["std"] diff --git a/substrate/srml/example/src/lib.rs b/substrate/srml/example/src/lib.rs index 68b52425ed..5925c438a8 100644 --- a/substrate/srml/example/src/lib.rs +++ b/substrate/srml/example/src/lib.rs @@ -506,7 +506,7 @@ mod tests { use srml_support::{assert_ok, impl_outer_origin, parameter_types}; use sr_io::with_externalities; - use substrate_primitives::{H256, Blake2Hasher}; + use primitives::{H256, Blake2Hasher}; // The testing primitives are very useful for avoiding having to work with signatures // or public keys. `u64` is used as the `AccountId` and no `Signature`s are requried. use sr_primitives::{ diff --git a/substrate/srml/executive/Cargo.toml b/substrate/srml/executive/Cargo.toml index 27057fe523..e732c9b636 100644 --- a/substrate/srml/executive/Cargo.toml +++ b/substrate/srml/executive/Cargo.toml @@ -9,13 +9,13 @@ serde = { version = "1.0", optional = true } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] hex-literal = "0.2.0" -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } srml-indices = { path = "../indices" } balances = { package = "srml-balances", path = "../balances" } @@ -26,7 +26,7 @@ std = [ "srml-support/std", "serde", "parity-codec/std", - "primitives/std", + "sr-primitives/std", "runtime_io/std", "system/std", ] diff --git a/substrate/srml/executive/src/lib.rs b/substrate/srml/executive/src/lib.rs index 9ae794d698..b1368e8a28 100644 --- a/substrate/srml/executive/src/lib.rs +++ b/substrate/srml/executive/src/lib.rs @@ -50,7 +50,7 @@ //! `Executive` type declaration from the node template. //! //! ``` -//! # use primitives::generic; +//! # use sr_primitives::generic; //! # use srml_executive as executive; //! # pub struct UncheckedExtrinsic {}; //! # pub struct Header {}; @@ -59,8 +59,8 @@ //! # pub type Balances = u64; //! # pub type AllModules = u64; //! # pub enum Runtime {}; -//! # use primitives::transaction_validity::TransactionValidity; -//! # use primitives::traits::ValidateUnsigned; +//! # use sr_primitives::transaction_validity::TransactionValidity; +//! # use sr_primitives::traits::ValidateUnsigned; //! # impl ValidateUnsigned for Runtime { //! # type Call = (); //! # @@ -77,19 +77,19 @@ use rstd::prelude::*; use rstd::marker::PhantomData; use rstd::result; -use primitives::{generic::Digest, traits::{ +use sr_primitives::{generic::Digest, traits::{ self, Header, Zero, One, Checkable, Applyable, CheckEqual, OnFinalize, OnInitialize, NumberFor, Block as BlockT, OffchainWorker, ValidateUnsigned }}; use srml_support::Dispatchable; use parity_codec::{Codec, Encode}; use system::{extrinsics_root, DigestOf}; -use primitives::{ApplyOutcome, ApplyError}; -use primitives::transaction_validity::TransactionValidity; -use primitives::weights::GetDispatchInfo; +use sr_primitives::{ApplyOutcome, ApplyError}; +use sr_primitives::transaction_validity::TransactionValidity; +use sr_primitives::weights::GetDispatchInfo; mod internal { - use primitives::traits::DispatchError; + use sr_primitives::traits::DispatchError; pub enum ApplyError { BadSignature(&'static str), @@ -292,7 +292,7 @@ where >::note_applied_extrinsic(&r, encoded_len as u32); r.map(|_| internal::ApplyOutcome::Success).or_else(|e| match e { - primitives::BLOCK_FULL => Err(internal::ApplyError::FullBlock), + sr_primitives::BLOCK_FULL => Err(internal::ApplyError::FullBlock), e => Ok(internal::ApplyOutcome::Fail(e)) }) } @@ -336,7 +336,7 @@ where Err("invalid account index") => return TransactionValidity::Unknown(INVALID_INDEX), // Technically a bad signature could also imply an out-of-date account index, but // that's more of an edge case. - Err(primitives::BAD_SIGNATURE) => return TransactionValidity::Invalid(ApplyError::BadSignature as i8), + Err(sr_primitives::BAD_SIGNATURE) => return TransactionValidity::Invalid(ApplyError::BadSignature as i8), Err(_) => return TransactionValidity::Invalid(UNKNOWN_ERROR), }; @@ -356,12 +356,12 @@ mod tests { use super::*; use balances::Call; use runtime_io::with_externalities; - use substrate_primitives::{H256, Blake2Hasher}; - use primitives::generic::Era; - use primitives::Perbill; - use primitives::weights::Weight; - use primitives::traits::{Header as HeaderT, BlakeTwo256, IdentityLookup, ConvertInto}; - use primitives::testing::{Digest, Header, Block}; + use primitives::{H256, Blake2Hasher}; + use sr_primitives::generic::Era; + use sr_primitives::Perbill; + use sr_primitives::weights::Weight; + use sr_primitives::traits::{Header as HeaderT, BlakeTwo256, IdentityLookup, ConvertInto}; + use sr_primitives::testing::{Digest, Header, Block}; use srml_support::{impl_outer_event, impl_outer_origin, parameter_types}; use srml_support::traits::{Currency, LockIdentifier, LockableCurrency, WithdrawReasons, WithdrawReason}; use system; @@ -391,7 +391,7 @@ mod tests { type Origin = Origin; type Index = u64; type BlockNumber = u64; - type Hash = substrate_primitives::H256; + type Hash = primitives::H256; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; @@ -443,7 +443,7 @@ mod tests { system::CheckWeight, balances::TakeFees ); - type TestXt = primitives::testing::TestXt, SignedExtra>; + type TestXt = sr_primitives::testing::TestXt, SignedExtra>; type Executive = super::Executive, system::ChainContext, Runtime, ()>; fn extra(nonce: u64, fee: u64) -> SignedExtra { @@ -466,7 +466,7 @@ mod tests { balances: vec![(1, 211)], vesting: vec![], }.assimilate_storage(&mut t.0, &mut t.1).unwrap(); - let xt = primitives::testing::TestXt(sign_extra(1, 0, 0), Call::transfer(2, 69)); + let xt = sr_primitives::testing::TestXt(sign_extra(1, 0, 0), Call::transfer(2, 69)); let weight = xt.get_dispatch_info().weight as u64; let mut t = runtime_io::TestExternalities::::new_with_children(t); with_externalities(&mut t, || { @@ -547,7 +547,7 @@ mod tests { fn bad_extrinsic_not_inserted() { let mut t = new_test_ext(1); // bad nonce check! - let xt = primitives::testing::TestXt(sign_extra(1, 30, 0), Call::transfer(33, 69)); + let xt = sr_primitives::testing::TestXt(sign_extra(1, 30, 0), Call::transfer(33, 69)); with_externalities(&mut t, || { Executive::initialize_block(&Header::new( 1, @@ -565,7 +565,7 @@ mod tests { fn block_weight_limit_enforced() { let mut t = new_test_ext(10000); // given: TestXt uses the encoded len as fixed Len: - let xt = primitives::testing::TestXt(sign_extra(1, 0, 0), Call::transfer::(33, 0)); + let xt = sr_primitives::testing::TestXt(sign_extra(1, 0, 0), Call::transfer::(33, 0)); let encoded = xt.encode(); let encoded_len = encoded.len() as Weight; let limit = AvailableBlockRatio::get() * MaximumBlockWeight::get(); @@ -581,7 +581,7 @@ mod tests { assert_eq!(>::all_extrinsics_weight(), 0); for nonce in 0..=num_to_exhaust_block { - let xt = primitives::testing::TestXt(sign_extra(1, nonce.into(), 0), Call::transfer::(33, 0)); + let xt = sr_primitives::testing::TestXt(sign_extra(1, nonce.into(), 0), Call::transfer::(33, 0)); let res = Executive::apply_extrinsic(xt); if nonce != num_to_exhaust_block { assert_eq!(res.unwrap(), ApplyOutcome::Success); @@ -596,9 +596,9 @@ mod tests { #[test] fn block_weight_and_size_is_stored_per_tx() { - let xt = primitives::testing::TestXt(sign_extra(1, 0, 0), Call::transfer(33, 0)); - let x1 = primitives::testing::TestXt(sign_extra(1, 1, 0), Call::transfer(33, 0)); - let x2 = primitives::testing::TestXt(sign_extra(1, 2, 0), Call::transfer(33, 0)); + let xt = sr_primitives::testing::TestXt(sign_extra(1, 0, 0), Call::transfer(33, 0)); + let x1 = sr_primitives::testing::TestXt(sign_extra(1, 1, 0), Call::transfer(33, 0)); + let x2 = sr_primitives::testing::TestXt(sign_extra(1, 2, 0), Call::transfer(33, 0)); let len = xt.clone().encode().len() as u32; let mut t = new_test_ext(1); with_externalities(&mut t, || { @@ -622,7 +622,7 @@ mod tests { #[test] fn validate_unsigned() { - let xt = primitives::testing::TestXt(None, Call::set_balance(33, 69, 69)); + let xt = sr_primitives::testing::TestXt(None, Call::set_balance(33, 69, 69)); let valid = TransactionValidity::Valid(Default::default()); let mut t = new_test_ext(1); @@ -645,7 +645,7 @@ mod tests { 10, lock, ); - let xt = primitives::testing::TestXt(sign_extra(1, 0, 0), Call::transfer(2, 10)); + let xt = sr_primitives::testing::TestXt(sign_extra(1, 0, 0), Call::transfer(2, 10)); let weight = xt.get_dispatch_info().weight as u64; Executive::initialize_block(&Header::new( 1, diff --git a/substrate/srml/finality-tracker/Cargo.toml b/substrate/srml/finality-tracker/Cargo.toml index e7eea0e152..3dfd453c75 100644 --- a/substrate/srml/finality-tracker/Cargo.toml +++ b/substrate/srml/finality-tracker/Cargo.toml @@ -9,12 +9,12 @@ serde = { version = "1.0", default-features = false, features = ["derive"] } parity-codec = { version = "4.1.1", default-features = false } inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } srml-system = { path = "../system", default-features = false } [dev-dependencies] -substrate-primitives = { path = "../../core/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } sr-io = { path = "../../core/sr-io", default-features = false } [features] @@ -24,7 +24,7 @@ std = [ "parity-codec/std", "rstd/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", "srml-system/std", "inherents/std", ] diff --git a/substrate/srml/finality-tracker/src/lib.rs b/substrate/srml/finality-tracker/src/lib.rs index d59183a166..f0e2ae0f54 100644 --- a/substrate/srml/finality-tracker/src/lib.rs +++ b/substrate/srml/finality-tracker/src/lib.rs @@ -23,7 +23,7 @@ use inherents::{ InherentData, MakeFatalError, }; use srml_support::StorageValue; -use primitives::traits::{One, Zero, SaturatedConversion}; +use sr_primitives::traits::{One, Zero, SaturatedConversion}; use rstd::{prelude::*, result, cmp, vec}; use parity_codec::Decode; use srml_support::{decl_module, decl_storage, for_each_tuple}; @@ -265,10 +265,10 @@ mod tests { use super::*; use sr_io::{with_externalities, TestExternalities}; - use substrate_primitives::H256; - use primitives::traits::{BlakeTwo256, IdentityLookup, OnFinalize, Header as HeaderT}; - use primitives::testing::Header; - use primitives::Perbill; + use primitives::H256; + use sr_primitives::traits::{BlakeTwo256, IdentityLookup, OnFinalize, Header as HeaderT}; + use sr_primitives::testing::Header; + use sr_primitives::Perbill; use srml_support::{assert_ok, impl_outer_origin, parameter_types}; use srml_system as system; use std::cell::RefCell; diff --git a/substrate/srml/generic-asset/Cargo.toml b/substrate/srml/generic-asset/Cargo.toml index bfa49d8018..0e10e15590 100644 --- a/substrate/srml/generic-asset/Cargo.toml +++ b/substrate/srml/generic-asset/Cargo.toml @@ -8,13 +8,13 @@ edition = "2018" serde = { version = "1.0", optional = true } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } support = { package = "srml-support", path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] runtime_io = { package = "sr-io", path = "../../core/sr-io" } -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } [features] default = ["std"] @@ -22,7 +22,7 @@ std =[ "serde/std", "parity-codec/std", "rstd/std", - "primitives/std", + "sr-primitives/std", "support/std", "system/std", ] diff --git a/substrate/srml/generic-asset/src/lib.rs b/substrate/srml/generic-asset/src/lib.rs index 8a4e47180c..60d1f0a3ff 100644 --- a/substrate/srml/generic-asset/src/lib.rs +++ b/substrate/srml/generic-asset/src/lib.rs @@ -153,7 +153,7 @@ use parity_codec::{Decode, Encode, HasCompact, Input, Output}; -use primitives::traits::{ +use sr_primitives::traits::{ CheckedAdd, CheckedSub, MaybeSerializeDebug, Member, One, Saturating, SimpleArithmetic, Zero, Bounded }; @@ -477,8 +477,8 @@ decl_storage! { config(endowed_accounts): Vec; build(| - storage: &mut primitives::StorageOverlay, - _: &mut primitives::ChildrenStorageOverlay, + storage: &mut sr_primitives::StorageOverlay, + _: &mut sr_primitives::ChildrenStorageOverlay, config: &GenesisConfig| { config.assets.iter().for_each(|asset_id| { config.endowed_accounts.iter().for_each(|account_id| { diff --git a/substrate/srml/generic-asset/src/mock.rs b/substrate/srml/generic-asset/src/mock.rs index 9437b06d20..80e04a6b7e 100644 --- a/substrate/srml/generic-asset/src/mock.rs +++ b/substrate/srml/generic-asset/src/mock.rs @@ -20,8 +20,8 @@ #![cfg(test)] -use primitives::{Perbill, testing::Header, traits::{BlakeTwo256, IdentityLookup}}; -use substrate_primitives::{Blake2Hasher, H256}; +use sr_primitives::{Perbill, testing::Header, traits::{BlakeTwo256, IdentityLookup}}; +use primitives::{Blake2Hasher, H256}; use support::{parameter_types, impl_outer_event, impl_outer_origin}; use super::*; diff --git a/substrate/srml/grandpa/Cargo.toml b/substrate/srml/grandpa/Cargo.toml index 2f13bd018f..478cddd153 100644 --- a/substrate/srml/grandpa/Cargo.toml +++ b/substrate/srml/grandpa/Cargo.toml @@ -7,10 +7,10 @@ edition = "2018" [dependencies] serde = { version = "1.0", optional = true, features = ["derive"] } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } -substrate-primitives = { path = "../../core/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } substrate-finality-grandpa-primitives = { path = "../../core/finality-grandpa/primitives", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } session = { package = "srml-session", path = "../session", default-features = false } @@ -24,11 +24,11 @@ default = ["std"] std = [ "serde", "parity-codec/std", - "substrate-primitives/std", + "primitives/std", "substrate-finality-grandpa-primitives/std", "rstd/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", "system/std", "session/std", "finality-tracker/std", diff --git a/substrate/srml/grandpa/src/lib.rs b/substrate/srml/grandpa/src/lib.rs index 9615953e67..6cde95d457 100644 --- a/substrate/srml/grandpa/src/lib.rs +++ b/substrate/srml/grandpa/src/lib.rs @@ -35,8 +35,8 @@ use parity_codec::{self as codec, Encode, Decode}; use srml_support::{ decl_event, decl_storage, decl_module, dispatch::Result, storage::StorageValue }; -use primitives::{ - generic::{DigestItem, OpaqueDigestItemId}, traits::CurrentHeight +use sr_primitives::{ + generic::{DigestItem, OpaqueDigestItemId}, traits::{CurrentHeight, Zero}, }; use fg_primitives::{ScheduledChange, ConsensusLog, GRANDPA_ENGINE_ID}; pub use fg_primitives::{AuthorityId, AuthorityWeight}; @@ -354,7 +354,6 @@ impl session::OneSessionHandler for Module { let next_authorities = validators.map(|(_, k)| (k, 1u64)).collect::>(); let last_authorities = >::grandpa_authorities(); if next_authorities != last_authorities { - use primitives::traits::Zero; if let Some((further_wait, median)) = >::take() { let _ = Self::schedule_change(next_authorities, further_wait, Some(median)); } else { diff --git a/substrate/srml/grandpa/src/mock.rs b/substrate/srml/grandpa/src/mock.rs index 9abb12b15b..637ae7c25f 100644 --- a/substrate/srml/grandpa/src/mock.rs +++ b/substrate/srml/grandpa/src/mock.rs @@ -18,10 +18,10 @@ #![cfg(test)] -use primitives::{Perbill, DigestItem, traits::IdentityLookup, testing::{Header, UintAuthorityId}}; +use sr_primitives::{Perbill, DigestItem, traits::IdentityLookup, testing::{Header, UintAuthorityId}}; use runtime_io; use srml_support::{impl_outer_origin, impl_outer_event, parameter_types}; -use substrate_primitives::{H256, Blake2Hasher}; +use primitives::{H256, Blake2Hasher}; use parity_codec::{Encode, Decode}; use crate::{AuthorityId, GenesisConfig, Trait, Module, ConsensusLog}; use substrate_finality_grandpa_primitives::GRANDPA_ENGINE_ID; @@ -52,7 +52,7 @@ impl system::Trait for Test { type Index = u64; type BlockNumber = u64; type Hash = H256; - type Hashing = ::primitives::traits::BlakeTwo256; + type Hashing = ::sr_primitives::traits::BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; type Header = Header; diff --git a/substrate/srml/grandpa/src/tests.rs b/substrate/srml/grandpa/src/tests.rs index 11700fa99f..adef602ce6 100644 --- a/substrate/srml/grandpa/src/tests.rs +++ b/substrate/srml/grandpa/src/tests.rs @@ -18,8 +18,8 @@ #![cfg(test)] -use primitives::testing::Digest; -use primitives::traits::{Header, OnFinalize}; +use sr_primitives::testing::Digest; +use sr_primitives::traits::{Header, OnFinalize}; use runtime_io::with_externalities; use crate::mock::*; use system::{EventRecord, Phase}; diff --git a/substrate/srml/im-online/Cargo.toml b/substrate/srml/im-online/Cargo.toml index 5ca5e0c533..c015e5e4c5 100644 --- a/substrate/srml/im-online/Cargo.toml +++ b/substrate/srml/im-online/Cargo.toml @@ -6,20 +6,20 @@ edition = "2018" [dependencies] parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } serde = { version = "1.0", optional = true } session = { package = "srml-session", path = "../session", default-features = false } srml-support = { path = "../support", default-features = false } sr-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -substrate_primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [features] default = ["std"] std = [ "parity-codec/std", - "primitives/std", + "sr-primitives/std", "rstd/std", "serde", "session/std", diff --git a/substrate/srml/im-online/src/lib.rs b/substrate/srml/im-online/src/lib.rs index 7898fea8eb..8254cb6078 100644 --- a/substrate/srml/im-online/src/lib.rs +++ b/substrate/srml/im-online/src/lib.rs @@ -68,14 +68,14 @@ // Ensure we're `no_std` when compiling for Wasm. #![cfg_attr(not(feature = "std"), no_std)] -use substrate_primitives::{ +use primitives::{ crypto::TypedKey, offchain::CryptoKey, offchain::OpaqueNetworkState, offchain::StorageKind, sr25519, ed25519, }; use parity_codec::{Encode, Decode}; -use primitives::{ +use sr_primitives::{ ApplyError, traits::{Member, IsMember, Extrinsic as ExtrinsicT}, transaction_validity::{TransactionValidity, TransactionLongevity, ValidTransaction}, }; diff --git a/substrate/srml/indices/Cargo.toml b/substrate/srml/indices/Cargo.toml index bc67132c86..c500cf5f87 100644 --- a/substrate/srml/indices/Cargo.toml +++ b/substrate/srml/indices/Cargo.toml @@ -11,10 +11,10 @@ parity-codec = { version = "4.1.1", default-features = false, features = ["deriv substrate-keyring = { path = "../../core/keyring", optional = true } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } runtime-io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } -substrate-primitives = { path = "../../core/primitives", default-features = false } [dev-dependencies] ref_thread_local = "0.0" @@ -26,10 +26,10 @@ std = [ "safe-mix/std", "substrate-keyring", "parity-codec/std", - "substrate-primitives/std", + "primitives/std", "rstd/std", "runtime-io/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", "system/std", ] diff --git a/substrate/srml/indices/src/lib.rs b/substrate/srml/indices/src/lib.rs index 45487e3b51..0bfd6d6054 100644 --- a/substrate/srml/indices/src/lib.rs +++ b/substrate/srml/indices/src/lib.rs @@ -22,7 +22,7 @@ use rstd::{prelude::*, result, marker::PhantomData, convert::TryInto}; use parity_codec::{Encode, Decode, Codec, Input, Output}; use srml_support::{StorageValue, StorageMap, Parameter, decl_module, decl_event, decl_storage}; -use primitives::traits::{One, SimpleArithmetic, StaticLookup, Member}; +use sr_primitives::traits::{One, SimpleArithmetic, StaticLookup, Member}; use system::{IsDeadAccount, OnNewAccount}; use self::address::Address as RawAddress; diff --git a/substrate/srml/indices/src/mock.rs b/substrate/srml/indices/src/mock.rs index d1ce8dbe2a..ef4b2eb649 100644 --- a/substrate/srml/indices/src/mock.rs +++ b/substrate/srml/indices/src/mock.rs @@ -20,9 +20,9 @@ use std::collections::HashSet; use ref_thread_local::{ref_thread_local, RefThreadLocal}; -use primitives::testing::Header; -use primitives::Perbill; -use substrate_primitives::{H256, Blake2Hasher}; +use sr_primitives::testing::Header; +use sr_primitives::Perbill; +use primitives::{H256, Blake2Hasher}; use srml_support::{impl_outer_origin, parameter_types}; use {runtime_io, system}; use crate::{GenesisConfig, Module, Trait, IsDeadAccount, OnNewAccount, ResolveHint}; @@ -76,7 +76,7 @@ impl system::Trait for Runtime { type Index = u64; type BlockNumber = u64; type Hash = H256; - type Hashing = ::primitives::traits::BlakeTwo256; + type Hashing = ::sr_primitives::traits::BlakeTwo256; type AccountId = u64; type Lookup = Indices; type Header = Header; diff --git a/substrate/srml/session/Cargo.toml b/substrate/srml/session/Cargo.toml index 51b613497f..a5dfb713d1 100644 --- a/substrate/srml/session/Cargo.toml +++ b/substrate/srml/session/Cargo.toml @@ -9,7 +9,7 @@ serde = { version = "1.0", optional = true } safe-mix = { version = "1.0", default-features = false} parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } timestamp = { package = "srml-timestamp", path = "../timestamp", default-features = false } @@ -17,7 +17,7 @@ substrate-trie = { path = "../../core/trie", default-features = false, optional runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } [dev-dependencies] -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } lazy_static = "1.0" [features] @@ -29,7 +29,7 @@ std = [ "parity-codec/std", "rstd/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", "timestamp/std", "substrate-trie/std" ] diff --git a/substrate/srml/session/src/historical.rs b/substrate/srml/session/src/historical.rs index c6755c3ba3..402a73adf3 100644 --- a/substrate/srml/session/src/historical.rs +++ b/substrate/srml/session/src/historical.rs @@ -27,8 +27,8 @@ use rstd::prelude::*; use parity_codec::{Encode, Decode}; -use primitives::KeyTypeId; -use primitives::traits::{Convert, OpaqueKeys, Hash as HashT}; +use sr_primitives::KeyTypeId; +use sr_primitives::traits::{Convert, OpaqueKeys, Hash as HashT}; use srml_support::{ StorageValue, StorageMap, decl_module, decl_storage, }; @@ -312,8 +312,8 @@ impl> srml_support::traits::KeyOwnerProofSystem<(KeyTyp mod tests { use super::*; use runtime_io::with_externalities; - use substrate_primitives::Blake2Hasher; - use primitives::{ + use primitives::Blake2Hasher; + use sr_primitives::{ traits::OnInitialize, testing::{UintAuthorityId, UINT_DUMMY_KEY}, }; diff --git a/substrate/srml/session/src/lib.rs b/substrate/srml/session/src/lib.rs index 8589f92006..a189a91da2 100644 --- a/substrate/srml/session/src/lib.rs +++ b/substrate/srml/session/src/lib.rs @@ -121,9 +121,9 @@ use rstd::{prelude::*, marker::PhantomData, ops::{Sub, Rem}}; use parity_codec::Decode; -use primitives::KeyTypeId; -use primitives::weights::SimpleDispatchInfo; -use primitives::traits::{Convert, Zero, Member, OpaqueKeys, TypedKey}; +use sr_primitives::KeyTypeId; +use sr_primitives::weights::SimpleDispatchInfo; +use sr_primitives::traits::{Convert, Zero, Member, OpaqueKeys, TypedKey}; use srml_support::{ dispatch::Result, ConsensusEngineId, StorageValue, StorageDoubleMap, for_each_tuple, decl_module, decl_event, decl_storage, @@ -317,8 +317,8 @@ decl_storage! { add_extra_genesis { config(keys): Vec<(T::ValidatorId, T::Keys)>; build(| - storage: &mut primitives::StorageOverlay, - _: &mut primitives::ChildrenStorageOverlay, + storage: &mut sr_primitives::StorageOverlay, + _: &mut sr_primitives::ChildrenStorageOverlay, config: &GenesisConfig | { runtime_io::with_storage(storage, || { @@ -562,8 +562,8 @@ mod tests { use super::*; use srml_support::assert_ok; use runtime_io::with_externalities; - use substrate_primitives::Blake2Hasher; - use primitives::{ + use primitives::Blake2Hasher; + use sr_primitives::{ traits::OnInitialize, testing::UintAuthorityId, }; diff --git a/substrate/srml/session/src/mock.rs b/substrate/srml/session/src/mock.rs index 5c2711e971..734f5bbde4 100644 --- a/substrate/srml/session/src/mock.rs +++ b/substrate/srml/session/src/mock.rs @@ -19,8 +19,8 @@ use super::*; use std::cell::RefCell; use srml_support::{impl_outer_origin, parameter_types}; -use substrate_primitives::H256; -use primitives::{ +use primitives::H256; +use sr_primitives::{ Perbill, traits::{BlakeTwo256, IdentityLookup, ConvertInto}, testing::{Header, UintAuthorityId} @@ -159,7 +159,7 @@ impl Trait for Test { #[cfg(feature = "historical")] impl crate::historical::Trait for Test { type FullIdentification = u64; - type FullIdentificationOf = primitives::traits::ConvertInto; + type FullIdentificationOf = sr_primitives::traits::ConvertInto; } pub type System = system::Module; diff --git a/substrate/srml/staking/Cargo.toml b/substrate/srml/staking/Cargo.toml index e9a660ebe0..5feab0f516 100644 --- a/substrate/srml/staking/Cargo.toml +++ b/substrate/srml/staking/Cargo.toml @@ -11,14 +11,14 @@ parity-codec = { version = "4.1.1", default-features = false, features = ["deriv substrate-keyring = { path = "../../core/keyring", optional = true } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } session = { package = "srml-session", path = "../session", default-features = false, features = ["historical"] } authorship = { package = "srml-authorship", path = "../authorship", default-features = false } [dev-dependencies] -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } balances = { package = "srml-balances", path = "../balances" } timestamp = { package = "srml-timestamp", path = "../timestamp" } rand = "0.6.5" @@ -35,7 +35,7 @@ std = [ "rstd/std", "runtime_io/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", "session/std", "system/std", "authorship/std", diff --git a/substrate/srml/staking/src/inflation.rs b/substrate/srml/staking/src/inflation.rs index 503a20a629..f80e94f7c4 100644 --- a/substrate/srml/staking/src/inflation.rs +++ b/substrate/srml/staking/src/inflation.rs @@ -16,7 +16,7 @@ //! http://research.web3.foundation/en/latest/polkadot/Token%20Economics/#inflation-model -use primitives::{Perbill, traits::SimpleArithmetic}; +use sr_primitives::{Perbill, traits::SimpleArithmetic}; /// Linear function truncated to positive part `y = max(0, b [+ or -] a*x)` for PNPoS usage #[derive(Debug, PartialEq, Eq, Clone, Copy)] diff --git a/substrate/srml/staking/src/lib.rs b/substrate/srml/staking/src/lib.rs index a1a555bcf5..ade395ec1c 100644 --- a/substrate/srml/staking/src/lib.rs +++ b/substrate/srml/staking/src/lib.rs @@ -293,14 +293,14 @@ use srml_support::{ } }; use session::{historical::OnSessionEnding, SelectInitialValidators, SessionIndex}; -use primitives::Perbill; -use primitives::weights::SimpleDispatchInfo; -use primitives::traits::{ +use sr_primitives::Perbill; +use sr_primitives::weights::SimpleDispatchInfo; +use sr_primitives::traits::{ Convert, Zero, One, StaticLookup, CheckedSub, CheckedShl, Saturating, Bounded, SaturatedConversion, SimpleArithmetic }; #[cfg(feature = "std")] -use primitives::{Serialize, Deserialize}; +use sr_primitives::{Serialize, Deserialize}; use system::{ensure_signed, ensure_root}; use phragmen::{elect, ACCURACY, ExtendedBalance, equalize}; @@ -621,8 +621,8 @@ decl_storage! { config(stakers): Vec<(T::AccountId, T::AccountId, BalanceOf, StakerStatus)>; build(| - storage: &mut primitives::StorageOverlay, - _: &mut primitives::ChildrenStorageOverlay, + storage: &mut sr_primitives::StorageOverlay, + _: &mut sr_primitives::ChildrenStorageOverlay, config: &GenesisConfig | { with_storage(storage, || { diff --git a/substrate/srml/staking/src/mock.rs b/substrate/srml/staking/src/mock.rs index 426ba680a9..344ef70e3b 100644 --- a/substrate/srml/staking/src/mock.rs +++ b/substrate/srml/staking/src/mock.rs @@ -17,10 +17,10 @@ //! Test utilities use std::{collections::HashSet, cell::RefCell}; -use primitives::Perbill; -use primitives::traits::{IdentityLookup, Convert, OpaqueKeys, OnInitialize}; -use primitives::testing::{Header, UintAuthorityId}; -use substrate_primitives::{H256, Blake2Hasher}; +use sr_primitives::Perbill; +use sr_primitives::traits::{IdentityLookup, Convert, OpaqueKeys, OnInitialize}; +use sr_primitives::testing::{Header, UintAuthorityId}; +use primitives::{H256, Blake2Hasher}; use runtime_io; use srml_support::{assert_ok, impl_outer_origin, parameter_types, EnumerableStorageMap}; use srml_support::traits::{Currency, Get, FindAuthor}; @@ -111,7 +111,7 @@ impl system::Trait for Test { type Index = u64; type BlockNumber = BlockNumber; type Hash = H256; - type Hashing = ::primitives::traits::BlakeTwo256; + type Hashing = ::sr_primitives::traits::BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; type Header = Header; diff --git a/substrate/srml/staking/src/phragmen.rs b/substrate/srml/staking/src/phragmen.rs index 39480bf689..cce2a8e0a3 100644 --- a/substrate/srml/staking/src/phragmen.rs +++ b/substrate/srml/staking/src/phragmen.rs @@ -17,8 +17,8 @@ //! Rust implementation of the Phragmén election algorithm. use rstd::{prelude::*, collections::btree_map::BTreeMap}; -use primitives::{PerU128}; -use primitives::traits::{Zero, Convert, Saturating}; +use sr_primitives::{PerU128}; +use sr_primitives::traits::{Zero, Convert, Saturating}; use crate::{BalanceOf, RawAssignment, ExpoMap, Trait, ValidatorPrefs, IndividualExposure}; type Fraction = PerU128; diff --git a/substrate/srml/staking/src/tests.rs b/substrate/srml/staking/src/tests.rs index 39409c2c39..4f42f991a8 100644 --- a/substrate/srml/staking/src/tests.rs +++ b/substrate/srml/staking/src/tests.rs @@ -19,7 +19,7 @@ use super::*; use runtime_io::with_externalities; use phragmen; -use primitives::traits::OnInitialize; +use sr_primitives::traits::OnInitialize; use srml_support::{assert_ok, assert_noop, assert_eq_uvec, EnumerableStorageMap}; use mock::*; use srml_support::traits::{Currency, ReservableCurrency}; diff --git a/substrate/srml/sudo/Cargo.toml b/substrate/srml/sudo/Cargo.toml index 7a25075390..6f7d290396 100644 --- a/substrate/srml/sudo/Cargo.toml +++ b/substrate/srml/sudo/Cargo.toml @@ -16,7 +16,7 @@ system = { package = "srml-system", path = "../system", default-features = false [dev-dependencies] sr-io = { path = "../../core/sr-io", default-features = false } -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } [features] default = ["std"] diff --git a/substrate/srml/support/Cargo.toml b/substrate/srml/support/Cargo.toml index 6abe1fb336..99fa2dbb38 100644 --- a/substrate/srml/support/Cargo.toml +++ b/substrate/srml/support/Cargo.toml @@ -11,7 +11,7 @@ srml-metadata = { path = "../metadata", default-features = false } sr-std = { path = "../../core/sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } sr-primitives = { path = "../../core/sr-primitives", default-features = false } -substrate-primitives = { path = "../../core/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } srml-support-procedural = { path = "./procedural" } paste = "0.1" diff --git a/substrate/srml/support/procedural/src/storage/transformation.rs b/substrate/srml/support/procedural/src/storage/transformation.rs index 0977c29665..2e33493964 100644 --- a/substrate/srml/support/procedural/src/storage/transformation.rs +++ b/substrate/srml/support/procedural/src/storage/transformation.rs @@ -531,8 +531,8 @@ fn decl_store_extra_genesis( impl#fparam_impl GenesisConfig#sparam #genesis_where_clause { pub fn build_storage #fn_generic (self) -> std::result::Result< ( - #scrate::runtime_primitives::StorageOverlay, - #scrate::runtime_primitives::ChildrenStorageOverlay, + #scrate::sr_primitives::StorageOverlay, + #scrate::sr_primitives::ChildrenStorageOverlay, ), String > #fn_where_clause { @@ -545,8 +545,8 @@ fn decl_store_extra_genesis( /// Assimilate the storage for this module into pre-existing overlays. pub fn assimilate_storage #fn_generic ( self, - r: &mut #scrate::runtime_primitives::StorageOverlay, - c: &mut #scrate::runtime_primitives::ChildrenStorageOverlay, + r: &mut #scrate::sr_primitives::StorageOverlay, + c: &mut #scrate::sr_primitives::ChildrenStorageOverlay, ) -> std::result::Result<(), String> #fn_where_clause { let storage = r; @@ -559,13 +559,13 @@ fn decl_store_extra_genesis( } #[cfg(feature = "std")] - impl#build_storage_impl #scrate::runtime_primitives::#impl_trait + impl#build_storage_impl #scrate::sr_primitives::#impl_trait for GenesisConfig#sparam #build_storage_where_clause { fn build_module_genesis_storage( self, - r: &mut #scrate::runtime_primitives::StorageOverlay, - c: &mut #scrate::runtime_primitives::ChildrenStorageOverlay, + r: &mut #scrate::sr_primitives::StorageOverlay, + c: &mut #scrate::sr_primitives::ChildrenStorageOverlay, ) -> std::result::Result<(), String> { self.assimilate_storage::<#fn_traitinstance> (r, c) } diff --git a/substrate/srml/support/src/dispatch.rs b/substrate/srml/support/src/dispatch.rs index 1e0556731e..0391d2995f 100644 --- a/substrate/srml/support/src/dispatch.rs +++ b/substrate/srml/support/src/dispatch.rs @@ -749,7 +749,7 @@ macro_rules! decl_module { fn on_initialize() { $( $impl:tt )* } ) => { impl<$trait_instance: $trait_name$(, $instance: $instantiable)?> - $crate::runtime_primitives::traits::OnInitialize<$trait_instance::BlockNumber> + $crate::sr_primitives::traits::OnInitialize<$trait_instance::BlockNumber> for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )* { fn on_initialize(_block_number_not_used: $trait_instance::BlockNumber) { $( $impl )* } @@ -762,7 +762,7 @@ macro_rules! decl_module { fn on_initialize($param:ident : $param_ty:ty) { $( $impl:tt )* } ) => { impl<$trait_instance: $trait_name$(, $instance: $instantiable)?> - $crate::runtime_primitives::traits::OnInitialize<$trait_instance::BlockNumber> + $crate::sr_primitives::traits::OnInitialize<$trait_instance::BlockNumber> for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )* { fn on_initialize($param: $param_ty) { $( $impl )* } @@ -774,7 +774,7 @@ macro_rules! decl_module { { $( $other_where_bounds:tt )* } ) => { impl<$trait_instance: $trait_name$(, $instance: $instantiable)?> - $crate::runtime_primitives::traits::OnInitialize<$trait_instance::BlockNumber> + $crate::sr_primitives::traits::OnInitialize<$trait_instance::BlockNumber> for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )* {} }; @@ -785,7 +785,7 @@ macro_rules! decl_module { fn on_finalize() { $( $impl:tt )* } ) => { impl<$trait_instance: $trait_name$(, $instance: $instantiable)?> - $crate::runtime_primitives::traits::OnFinalize<$trait_instance::BlockNumber> + $crate::sr_primitives::traits::OnFinalize<$trait_instance::BlockNumber> for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )* { fn on_finalize(_block_number_not_used: $trait_instance::BlockNumber) { $( $impl )* } @@ -798,7 +798,7 @@ macro_rules! decl_module { fn on_finalize($param:ident : $param_ty:ty) { $( $impl:tt )* } ) => { impl<$trait_instance: $trait_name$(, $instance: $instantiable)?> - $crate::runtime_primitives::traits::OnFinalize<$trait_instance::BlockNumber> + $crate::sr_primitives::traits::OnFinalize<$trait_instance::BlockNumber> for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )* { fn on_finalize($param: $param_ty) { $( $impl )* } @@ -810,7 +810,7 @@ macro_rules! decl_module { { $( $other_where_bounds:tt )* } ) => { impl<$trait_instance: $trait_name$(, $instance: $instantiable)?> - $crate::runtime_primitives::traits::OnFinalize<$trait_instance::BlockNumber> + $crate::sr_primitives::traits::OnFinalize<$trait_instance::BlockNumber> for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )* { } @@ -822,7 +822,7 @@ macro_rules! decl_module { fn offchain_worker() { $( $impl:tt )* } ) => { impl<$trait_instance: $trait_name$(, $instance: $instantiable)?> - $crate::runtime_primitives::traits::OffchainWorker<$trait_instance::BlockNumber> + $crate::sr_primitives::traits::OffchainWorker<$trait_instance::BlockNumber> for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )* { fn generate_extrinsics(_block_number_not_used: $trait_instance::BlockNumber) { $( $impl )* } @@ -835,7 +835,7 @@ macro_rules! decl_module { fn offchain_worker($param:ident : $param_ty:ty) { $( $impl:tt )* } ) => { impl<$trait_instance: $trait_name$(, $instance: $instantiable)?> - $crate::runtime_primitives::traits::OffchainWorker<$trait_instance::BlockNumber> + $crate::sr_primitives::traits::OffchainWorker<$trait_instance::BlockNumber> for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )* { fn generate_extrinsics($param: $param_ty) { $( $impl )* } @@ -847,7 +847,7 @@ macro_rules! decl_module { { $( $other_where_bounds:tt )* } ) => { impl<$trait_instance: $trait_name$(, $instance: $instantiable)?> - $crate::runtime_primitives::traits::OffchainWorker<$trait_instance::BlockNumber> + $crate::sr_primitives::traits::OffchainWorker<$trait_instance::BlockNumber> for $module<$trait_instance$(, $instance)?> where $( $other_where_bounds )* {} }; @@ -1595,7 +1595,7 @@ macro_rules! __check_reserved_fn_name { #[allow(dead_code)] mod tests { use super::*; - use crate::runtime_primitives::traits::{OnInitialize, OnFinalize}; + use crate::sr_primitives::traits::{OnInitialize, OnFinalize}; use sr_primitives::weights::{DispatchInfo, DispatchClass}; pub trait Trait: system::Trait + Sized where Self::AccountId: From { diff --git a/substrate/srml/support/src/inherent.rs b/substrate/srml/support/src/inherent.rs index d886abbca7..1b6d8fbdd7 100644 --- a/substrate/srml/support/src/inherent.rs +++ b/substrate/srml/support/src/inherent.rs @@ -17,7 +17,7 @@ #[doc(hidden)] pub use crate::rstd::vec::Vec; #[doc(hidden)] -pub use crate::runtime_primitives::traits::{Block as BlockT, Extrinsic}; +pub use crate::sr_primitives::traits::{Block as BlockT, Extrinsic}; #[doc(hidden)] pub use inherents::{InherentData, ProvideInherent, CheckInherentsResult, IsFatalError}; diff --git a/substrate/srml/support/src/lib.rs b/substrate/srml/support/src/lib.rs index e504726703..677fd6b82e 100644 --- a/substrate/srml/support/src/lib.rs +++ b/substrate/srml/support/src/lib.rs @@ -35,7 +35,6 @@ pub use codec; pub use once_cell; #[doc(hidden)] pub use paste; -pub use sr_primitives as runtime_primitives; pub use self::storage::hashed::generator::{ HashedStorage, Twox256, Twox128, Blake2_256, Blake2_128, Twox64Concat @@ -69,7 +68,7 @@ pub use self::hashable::Hashable; pub use self::dispatch::{Parameter, Dispatchable, Callable, IsSubType}; pub use self::double_map::StorageDoubleMapWithHasher; pub use runtime_io::{print, storage_root}; -pub use runtime_primitives::ConsensusEngineId; +pub use sr_primitives::{self, ConsensusEngineId}; /// Macro for easily creating a new implementation of the `Get` trait. Use similarly to /// how you would declare a `const`: diff --git a/substrate/srml/support/src/runtime.rs b/substrate/srml/support/src/runtime.rs index 0897bd153b..9aae241dba 100644 --- a/substrate/srml/support/src/runtime.rs +++ b/substrate/srml/support/src/runtime.rs @@ -194,10 +194,10 @@ macro_rules! construct_runtime { #[derive(Clone, Copy, PartialEq, Eq)] #[cfg_attr(feature = "std", derive(Debug))] pub struct $runtime; - impl $crate::runtime_primitives::traits::GetNodeBlockType for $runtime { + impl $crate::sr_primitives::traits::GetNodeBlockType for $runtime { type NodeBlock = $node_block; } - impl $crate::runtime_primitives::traits::GetRuntimeBlockType for $runtime { + impl $crate::sr_primitives::traits::GetRuntimeBlockType for $runtime { type RuntimeBlock = $block; } $crate::__decl_outer_event!( @@ -698,7 +698,7 @@ macro_rules! __decl_outer_config { }; ) => { $crate::paste::item! { - $crate::runtime_primitives::impl_outer_config!( + $crate::sr_primitives::impl_outer_config!( pub struct GenesisConfig for $runtime { $( [< $parsed_name Config >] => diff --git a/substrate/srml/support/src/traits.rs b/substrate/srml/support/src/traits.rs index aca056eb50..5f1d7c32ef 100644 --- a/substrate/srml/support/src/traits.rs +++ b/substrate/srml/support/src/traits.rs @@ -20,9 +20,9 @@ use crate::rstd::{result, marker::PhantomData, ops::Div}; use crate::codec::{Codec, Encode, Decode}; -use substrate_primitives::u32_trait::Value as U32; -use crate::runtime_primitives::traits::{MaybeSerializeDebug, SimpleArithmetic, Saturating}; -use crate::runtime_primitives::ConsensusEngineId; +use primitives::u32_trait::Value as U32; +use crate::sr_primitives::traits::{MaybeSerializeDebug, SimpleArithmetic, Saturating}; +use crate::sr_primitives::ConsensusEngineId; use super::for_each_tuple; diff --git a/substrate/srml/support/src/unsigned.rs b/substrate/srml/support/src/unsigned.rs index 8ea613461a..1c62dd0c58 100644 --- a/substrate/srml/support/src/unsigned.rs +++ b/substrate/srml/support/src/unsigned.rs @@ -15,11 +15,11 @@ // along with Substrate. If not, see . #[doc(hidden)] -pub use crate::runtime_primitives::traits::ValidateUnsigned; +pub use crate::sr_primitives::traits::ValidateUnsigned; #[doc(hidden)] -pub use crate::runtime_primitives::transaction_validity::TransactionValidity; +pub use crate::sr_primitives::transaction_validity::TransactionValidity; #[doc(hidden)] -pub use crate::runtime_primitives::ApplyError; +pub use crate::sr_primitives::ApplyError; /// Implement `ValidateUnsigned` for `Runtime`. diff --git a/substrate/srml/support/test/tests/instance.rs b/substrate/srml/support/test/tests/instance.rs index 30db9c980b..863532ff09 100644 --- a/substrate/srml/support/test/tests/instance.rs +++ b/substrate/srml/support/test/tests/instance.rs @@ -18,7 +18,7 @@ use runtime_io::{with_externalities, Blake2Hasher}; use srml_support::{ Parameter, traits::Get, parameter_types, - runtime_primitives::{generic, BuildStorage, traits::{BlakeTwo256, Block as _, Verify}}, + sr_primitives::{generic, BuildStorage, traits::{BlakeTwo256, Block as _, Verify}}, metadata::{ DecodeDifferent, StorageMetadata, StorageEntryModifier, StorageEntryType, DefaultByteGetter, StorageEntryMetadata, StorageHasher @@ -504,4 +504,4 @@ fn instance_prefix_is_prefix_of_entries() { assert!(module2::Instance2::PREFIX_FOR_Map.starts_with(prefix)); assert!(module2::Instance2::PREFIX_FOR_LinkedMap.starts_with(prefix)); assert!(module2::Instance2::PREFIX_FOR_DoubleMap.starts_with(prefix)); -} \ No newline at end of file +} diff --git a/substrate/srml/support/test/tests/issue2219.rs b/substrate/srml/support/test/tests/issue2219.rs index 54ad62cc93..cb8b4cef09 100644 --- a/substrate/srml/support/test/tests/issue2219.rs +++ b/substrate/srml/support/test/tests/issue2219.rs @@ -14,8 +14,8 @@ // You should have received a copy of the GNU General Public License // along with Substrate. If not, see . -use srml_support::runtime_primitives::generic; -use srml_support::runtime_primitives::traits::{BlakeTwo256, Block as _, Verify}; +use srml_support::sr_primitives::generic; +use srml_support::sr_primitives::traits::{BlakeTwo256, Block as _, Verify}; use srml_support::codec::{Encode, Decode}; use primitives::{H256, sr25519}; use serde::{Serialize, Deserialize}; diff --git a/substrate/srml/system/Cargo.toml b/substrate/srml/system/Cargo.toml index d6039499e1..35ddfabd6e 100644 --- a/substrate/srml/system/Cargo.toml +++ b/substrate/srml/system/Cargo.toml @@ -8,10 +8,10 @@ edition = "2018" serde = { version = "1.0", optional = true, features = ["derive"] } safe-mix = { version = "1.0", default-features = false} parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } -substrate-primitives = { path = "../../core/primitives", default-features = false } +primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } runtime_io = { package = "sr-io", path = "../../core/sr-io", default-features = false } -primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } [dev-dependencies] @@ -23,11 +23,11 @@ std = [ "serde", "safe-mix/std", "parity-codec/std", - "substrate-primitives/std", + "primitives/std", "rstd/std", "runtime_io/std", "srml-support/std", - "primitives/std", + "sr-primitives/std", ] [[bench]] diff --git a/substrate/srml/system/benches/bench.rs b/substrate/srml/system/benches/bench.rs index 071446ea35..8e13e92d3f 100644 --- a/substrate/srml/system/benches/bench.rs +++ b/substrate/srml/system/benches/bench.rs @@ -18,8 +18,8 @@ use criterion::{Criterion, criterion_group, criterion_main, black_box}; use srml_system as system; use srml_support::{decl_module, decl_event, impl_outer_origin, impl_outer_event}; use runtime_io::{with_externalities, Blake2Hasher}; -use substrate_primitives::H256; -use primitives::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header}; +use primitives::H256; +use sr_primitives::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header}; mod module { use super::*; diff --git a/substrate/srml/system/src/lib.rs b/substrate/srml/system/src/lib.rs index e98c53bf1d..1d73567c77 100644 --- a/substrate/srml/system/src/lib.rs +++ b/substrate/srml/system/src/lib.rs @@ -77,16 +77,16 @@ use rstd::prelude::*; #[cfg(any(feature = "std", test))] use rstd::map; use rstd::marker::PhantomData; -use primitives::generic::{self, Era}; -use primitives::Perbill; -use primitives::weights::{Weight, DispatchInfo, DispatchClass, WeightMultiplier, SimpleDispatchInfo}; -use primitives::transaction_validity::{ValidTransaction, TransactionPriority, TransactionLongevity}; -use primitives::traits::{self, CheckEqual, SimpleArithmetic, Zero, SignedExtension, Convert, +use sr_primitives::generic::{self, Era}; +use sr_primitives::Perbill; +use sr_primitives::weights::{Weight, DispatchInfo, DispatchClass, WeightMultiplier, SimpleDispatchInfo}; +use sr_primitives::transaction_validity::{ValidTransaction, TransactionPriority, TransactionLongevity}; +use sr_primitives::traits::{self, CheckEqual, SimpleArithmetic, Zero, SignedExtension, Convert, SimpleBitOps, Hash, Member, MaybeDisplay, EnsureOrigin, CurrentHeight, BlockNumberToHash, MaybeSerializeDebugButNotDeserialize, MaybeSerializeDebug, StaticLookup, One, Bounded, Lookup, DispatchError, SaturatedConversion, }; -use substrate_primitives::storage::well_known_keys; +use primitives::storage::well_known_keys; use srml_support::{ storage, decl_module, decl_event, decl_storage, StorageDoubleMap, StorageValue, StorageMap, Parameter, for_each_tuple, traits::{Contains, Get} @@ -98,7 +98,7 @@ use parity_codec::{Encode, Decode}; use runtime_io::{twox_128, TestExternalities, Blake2Hasher}; #[cfg(any(feature = "std", test))] -use substrate_primitives::ChangesTrieConfiguration; +use primitives::ChangesTrieConfiguration; /// Handler for when a new account has been created. pub trait OnNewAccount { @@ -401,10 +401,14 @@ decl_storage! { } add_extra_genesis { config(changes_trie_config): Option; - #[serde(with = "substrate_primitives::bytes")] + #[serde(with = "primitives::bytes")] config(code): Vec; - build(|storage: &mut primitives::StorageOverlay, _: &mut primitives::ChildrenStorageOverlay, config: &GenesisConfig| { + build( + |storage: &mut sr_primitives::StorageOverlay, + _: &mut sr_primitives::ChildrenStorageOverlay, + config: &GenesisConfig| + { use parity_codec::Encode; storage.insert(well_known_keys::CODE.to_vec(), config.code.clone()); @@ -1042,8 +1046,8 @@ impl BlockNumberToHash for ChainContext { mod tests { use super::*; use runtime_io::with_externalities; - use substrate_primitives::H256; - use primitives::{traits::{BlakeTwo256, IdentityLookup}, testing::Header}; + use primitives::H256; + use sr_primitives::{traits::{BlakeTwo256, IdentityLookup}, testing::Header}; use srml_support::{impl_outer_origin, parameter_types}; impl_outer_origin!{ diff --git a/substrate/srml/timestamp/Cargo.toml b/substrate/srml/timestamp/Cargo.toml index bb82d1a42b..765573ce46 100644 --- a/substrate/srml/timestamp/Cargo.toml +++ b/substrate/srml/timestamp/Cargo.toml @@ -8,14 +8,14 @@ edition = "2018" serde = { version = "1.0", optional = true } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } inherents = { package = "substrate-inherents", path = "../../core/inherents", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } [dev-dependencies] runtime_io = { package = "sr-io", path = "../../core/sr-io" } -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } [features] default = ["std"] @@ -23,7 +23,7 @@ std = [ "inherents/std", "parity-codec/std", "rstd/std", - "runtime_primitives/std", + "sr-primitives/std", "srml-support/std", "serde", "system/std", diff --git a/substrate/srml/timestamp/src/lib.rs b/substrate/srml/timestamp/src/lib.rs index 46ffb6ed22..cc439da8ee 100644 --- a/substrate/srml/timestamp/src/lib.rs +++ b/substrate/srml/timestamp/src/lib.rs @@ -98,8 +98,8 @@ use parity_codec::Decode; use inherents::ProvideInherentData; use srml_support::{StorageValue, Parameter, decl_storage, decl_module, for_each_tuple}; use srml_support::traits::{Time, Get}; -use runtime_primitives::traits::{SimpleArithmetic, Zero, SaturatedConversion}; -use runtime_primitives::weights::SimpleDispatchInfo; +use sr_primitives::traits::{SimpleArithmetic, Zero, SaturatedConversion}; +use sr_primitives::weights::SimpleDispatchInfo; use system::ensure_none; use inherents::{RuntimeString, InherentIdentifier, ProvideInherent, IsFatalError, InherentData}; @@ -339,8 +339,8 @@ mod tests { use srml_support::{impl_outer_origin, assert_ok, parameter_types}; use runtime_io::{with_externalities, TestExternalities}; - use substrate_primitives::H256; - use runtime_primitives::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header}; + use primitives::H256; + use sr_primitives::{Perbill, traits::{BlakeTwo256, IdentityLookup}, testing::Header}; impl_outer_origin! { pub enum Origin for Test {} diff --git a/substrate/srml/treasury/Cargo.toml b/substrate/srml/treasury/Cargo.toml index 64190f9c4f..4314d959b3 100644 --- a/substrate/srml/treasury/Cargo.toml +++ b/substrate/srml/treasury/Cargo.toml @@ -8,14 +8,14 @@ edition = "2018" serde = { version = "1.0", optional = true, features = ["derive"] } parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } rstd = { package = "sr-std", path = "../../core/sr-std", default-features = false } -runtime_primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } srml-support = { path = "../support", default-features = false } system = { package = "srml-system", path = "../system", default-features = false } balances = { package = "srml-balances", path = "../balances", default-features = false } [dev-dependencies] runtime_io = { package = "sr-io", path = "../../core/sr-io" } -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } [features] default = ["std"] @@ -23,7 +23,7 @@ std = [ "serde", "parity-codec/std", "rstd/std", - "runtime_primitives/std", + "sr-primitives/std", "srml-support/std", "system/std", "balances/std", diff --git a/substrate/srml/treasury/src/lib.rs b/substrate/srml/treasury/src/lib.rs index f86a8271a2..702fe3048e 100644 --- a/substrate/srml/treasury/src/lib.rs +++ b/substrate/srml/treasury/src/lib.rs @@ -75,11 +75,11 @@ use srml_support::traits::{ Currency, ExistenceRequirement, Get, Imbalance, OnDilution, OnUnbalanced, ReservableCurrency, WithdrawReason }; -use runtime_primitives::{Permill, ModuleId}; -use runtime_primitives::traits::{ +use sr_primitives::{Permill, ModuleId}; +use sr_primitives::traits::{ Zero, EnsureOrigin, StaticLookup, CheckedSub, CheckedMul, AccountIdConversion }; -use runtime_primitives::weights::SimpleDispatchInfo; +use sr_primitives::weights::SimpleDispatchInfo; use parity_codec::{Encode, Decode}; use system::ensure_signed; @@ -363,8 +363,8 @@ mod tests { use runtime_io::with_externalities; use srml_support::{assert_noop, assert_ok, impl_outer_origin, parameter_types}; - use substrate_primitives::{H256, Blake2Hasher}; - use runtime_primitives::{Perbill, traits::{BlakeTwo256, OnFinalize, IdentityLookup}, testing::Header}; + use primitives::{H256, Blake2Hasher}; + use sr_primitives::{Perbill, traits::{BlakeTwo256, OnFinalize, IdentityLookup}, testing::Header}; impl_outer_origin! { pub enum Origin for Test {} diff --git a/substrate/subkey/Cargo.toml b/substrate/subkey/Cargo.toml index 6ecede88ed..3e0079cedf 100644 --- a/substrate/subkey/Cargo.toml +++ b/substrate/subkey/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Parity Technologies "] edition = "2018" [dependencies] -substrate-primitives = { version = "*", path = "../core/primitives" } +primitives = { package = "substrate-primitives", version = "*", path = "../core/primitives" } node-runtime = { version = "*", path = "../node/runtime" } node-primitives = { version = "*", path = "../node/primitives" } sr-primitives = { version = "*", path = "../core/sr-primitives" } diff --git a/substrate/subkey/src/main.rs b/substrate/subkey/src/main.rs index 16abc8723a..9ef3586ed0 100644 --- a/substrate/subkey/src/main.rs +++ b/substrate/subkey/src/main.rs @@ -22,7 +22,7 @@ use std::{str::FromStr, io::{stdin, Read}, convert::TryInto}; use hex_literal::hex; use clap::load_yaml; use bip39::{Mnemonic, Language, MnemonicType}; -use substrate_primitives::{ +use primitives::{ ed25519, sr25519, hexdisplay::HexDisplay, Pair, Public, blake2_256, crypto::{Ss58Codec, set_default_ss58_version, Ss58AddressFormat} }; diff --git a/substrate/subkey/src/vanity.rs b/substrate/subkey/src/vanity.rs index ea1a609218..988055c67c 100644 --- a/substrate/subkey/src/vanity.rs +++ b/substrate/subkey/src/vanity.rs @@ -16,7 +16,7 @@ use rand::{rngs::OsRng, RngCore}; use super::Crypto; -use substrate_primitives::Pair; +use primitives::Pair; fn good_waypoint(done: u64) -> u64 { match done { @@ -103,7 +103,7 @@ pub(super) fn generate_key(desired: &str) -> Result, &str> mod tests { use super::*; use super::super::Ed25519; - use substrate_primitives::{Pair, crypto::Ss58Codec}; + use primitives::{Pair, crypto::Ss58Codec}; #[cfg(feature = "bench")] use test::Bencher; diff --git a/substrate/test-utils/chain-spec-builder/Cargo.toml b/substrate/test-utils/chain-spec-builder/Cargo.toml index a54094d8c7..1e048a91cd 100644 --- a/substrate/test-utils/chain-spec-builder/Cargo.toml +++ b/substrate/test-utils/chain-spec-builder/Cargo.toml @@ -7,5 +7,5 @@ edition = "2018" [dependencies] clap = { version = "~2.32", features = ["yaml"] } node-cli = { path = "../../node/cli" } -substrate-primitives = { path = "../../core/primitives" } +primitives = { package = "substrate-primitives", path = "../../core/primitives" } substrate-service = { path = "../../core/service" } diff --git a/substrate/test-utils/transaction-factory/Cargo.toml b/substrate/test-utils/transaction-factory/Cargo.toml index 2868b4f537..1c4cf5a5d5 100644 --- a/substrate/test-utils/transaction-factory/Cargo.toml +++ b/substrate/test-utils/transaction-factory/Cargo.toml @@ -11,12 +11,12 @@ consensus_common = { package = "substrate-consensus-common", path = "../../core/ log = "0.4" parity-codec = { version = "4.1.1", default-features = false, features = ["derive"] } primitives = { package = "substrate-primitives", path = "../../core/primitives", default-features = false } -sr_primitives = { package = "sr-primitives", path = "../../core/sr-primitives", default-features = false } +sr-primitives = { path = "../../core/sr-primitives", default-features = false } substrate-service = { path = "../../core/service" } [features] default = ["std"] std = [ "parity-codec/std", - "primitives/std", + "sr-primitives/std", ]