Avoid Duplicate Names (#966)

darwinia-network · Dec 1, 2021 · b0359e2 · b0359e2
1 parent a0cde9b
commit b0359e2
Show file tree

Hide file tree

Showing 32 changed files with 117 additions and 117 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/primitives/bridge/Cargo.toml b/node/primitives/bridge/Cargo.toml
@@ -4,15 +4,15 @@ description = "Pangolin node bridge primitives"
 edition     = "2021"
 homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
-name        = "bridge-primitives"
+name        = "drml-bridge-primitives"
 readme      = "README.md"
 repository  = "https://github.com/darwinia-network/darwinia-common/"
 version     = "2.7.0"
 
 [dependencies]
 # darwinia-network
-common-primitives   = { default-features = false, path = "../common" }
-darwinia-fee-market = { default-features = false, path = "../../../frame/fee-market" }
+darwinia-fee-market    = { default-features = false, path = "../../../frame/fee-market" }
+drml-common-primitives = { default-features = false, path = "../common" }
 # paritytech
 bp-messages            = { default-features = false, git = "https://github.com/darwinia-network/parity-bridges-common", tag = "darwinia-v0.11.6-3" }
 bp-runtime             = { default-features = false, git = "https://github.com/darwinia-network/parity-bridges-common", tag = "darwinia-v0.11.6-3" }
@@ -29,8 +29,8 @@ default = ["std"]
 
 std = [
 	# darwinia-network
-	"common-primitives/std",
 	"darwinia-fee-market/std",
+	"drml-common-primitives/std",
 	# paritytech
 	"bp-messages/std",
 	"bp-runtime/std",

diff --git a/node/primitives/bridge/src/lib.rs b/node/primitives/bridge/src/lib.rs
@@ -38,8 +38,8 @@ use sp_core::H256;
 use sp_runtime::{traits::Convert, RuntimeDebug};
 use sp_std::prelude::*;
 // --- darwinia-network ---
-use common_primitives::*;
 use darwinia_fee_market::RingBalance;
+use drml_common_primitives::*;
 
 /// Maximal size (in bytes) of encoded (using `Encode::encode()`) account id.
 pub const MAXIMAL_ENCODED_ACCOUNT_ID_SIZE: u32 = 32;

diff --git a/node/primitives/common/Cargo.toml b/node/primitives/common/Cargo.toml
@@ -4,7 +4,7 @@ description = "DRML node runtime primitives"
 edition     = "2021"
 homepage    = "https://darwinia.network/"
 license     = "GPL-3.0"
-name        = "common-primitives"
+name        = "drml-common-primitives"
 readme      = "README.md"
 repository  = "https://github.com/darwinia-network/darwinia-common/"
 version     = "2.7.0"

diff --git a/node/rpc/Cargo.toml b/node/rpc/Cargo.toml
@@ -14,14 +14,14 @@ version     = "2.7.0"
 jsonrpc-core   = { version = "15.1" }
 jsonrpc-pubsub = { version = "15.1" }
 # darwinia-network
-common-primitives       = { path = "../primitives/common" }
 darwinia-balances-rpc   = { path = "../../frame/balances/rpc" }
 darwinia-fee-market-rpc = { path = "../../frame/fee-market/rpc" }
 darwinia-header-mmr-rpc = { path = "../../frame/header-mmr/rpc" }
 darwinia-staking-rpc    = { path = "../../frame/staking/rpc" }
 dc-db                   = { path = "../../client/dvm/db" }
 dc-rpc                  = { path = "../../client/dvm/rpc", features = ["rpc_binary_search_estimate"] }
 dp-rpc                  = { path = "../../primitives/rpc" }
+drml-common-primitives  = { path = "../primitives/common" }
 dvm-ethereum            = { path = "../../frame/dvm" }
 dvm-rpc-runtime-api     = { path = "../../frame/dvm/rpc/runtime-api" }
 pangolin-runtime        = { path = "../runtime/pangolin" }

diff --git a/node/rpc/src/lib.rs b/node/rpc/src/lib.rs
@@ -25,7 +25,7 @@ pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
 // --- std ---
 use std::sync::Arc;
 // --- darwinia-network ---
-use common_primitives::{BlockNumber, Hash, OpaqueBlock as Block};
+use drml_common_primitives::{BlockNumber, Hash, OpaqueBlock as Block};
 
 /// A type representing all RPC extensions.
 pub type RpcExtension = jsonrpc_core::IoHandler<sc_rpc::Metadata>;

diff --git a/node/rpc/src/pangolin.rs b/node/rpc/src/pangolin.rs
@@ -24,8 +24,8 @@
 use std::{collections::BTreeMap, sync::Arc};
 // --- darwinia-network ---
 use crate::*;
-use common_primitives::{AccountId, Balance, Nonce, Power};
 use dp_rpc::{FilterPool, PendingTransactions};
+use drml_common_primitives::{AccountId, Balance, Nonce, Power};
 use dvm_ethereum::EthereumStorageSchema;
 
 /// Full client dependencies.

diff --git a/node/rpc/src/pangoro.rs b/node/rpc/src/pangoro.rs
@@ -28,7 +28,7 @@ use std::sync::Arc;
 use sp_api::ProvideRuntimeApi;
 // --- darwinia-network ---
 use crate::*;
-use common_primitives::{AccountId, Balance, Nonce};
+use drml_common_primitives::{AccountId, Balance, Nonce};
 
 /// Full client dependencies
 pub struct FullDeps<C, P, SC, B> {

diff --git a/node/runtime/common/Cargo.toml b/node/runtime/common/Cargo.toml
@@ -13,9 +13,9 @@ version     = "2.7.0"
 codec             = { package = "parity-scale-codec", version = "2.1", default-features = false }
 static_assertions = { version = "1.1" }
 # darwinia-network
-common-primitives = { default-features = false, path = "../../primitives/common" }
-darwinia-balances = { default-features = false, path = "../../../frame/balances" }
-darwinia-support  = { default-features = false, path = "../../../frame/support" }
+darwinia-balances      = { default-features = false, path = "../../../frame/balances" }
+darwinia-support       = { default-features = false, path = "../../../frame/support" }
+drml-common-primitives = { default-features = false, path = "../../primitives/common" }
 # paritytech
 frame-support              = { default-features = false, git = "https://github.com/darwinia-network/substrate", tag = "darwinia-v0.11.6-1" }
 frame-system               = { default-features = false, git = "https://github.com/darwinia-network/substrate", tag = "darwinia-v0.11.6-1" }
@@ -36,9 +36,9 @@ std = [
 	# crates.io
 	"codec/std",
 	# darwinia-network
-	"common-primitives/std",
 	"darwinia-balances/std",
 	"darwinia-support/std",
+	"drml-common-primitives/std",
 	# paritytech
 	"frame-support/std",
 	"frame-system/std",

diff --git a/node/runtime/common/src/impls.rs b/node/runtime/common/src/impls.rs
@@ -32,7 +32,7 @@ darwinia_support::impl_account_data! {
 		RingInstance,
 		KtonInstance
 	where
-		Balance = common_primitives::Balance
+		Balance = drml_common_primitives::Balance
 	{
 		// other data
 	}
@@ -43,8 +43,8 @@ pub struct ToAuthor<R>(sp_std::marker::PhantomData<R>);
 impl<R> OnUnbalanced<NegativeImbalance<R>> for ToAuthor<R>
 where
 	R: darwinia_balances::Config<RingInstance> + pallet_authorship::Config,
-	<R as frame_system::Config>::AccountId: From<common_primitives::AccountId>,
-	<R as frame_system::Config>::AccountId: Into<common_primitives::AccountId>,
+	<R as frame_system::Config>::AccountId: From<drml_common_primitives::AccountId>,
+	<R as frame_system::Config>::AccountId: Into<drml_common_primitives::AccountId>,
 	<R as frame_system::Config>::Event: From<darwinia_balances::Event<R, RingInstance>>,
 {
 	fn on_nonzero_unbalanced(amount: NegativeImbalance<R>) {
@@ -68,8 +68,8 @@ where
 		+ pallet_treasury::Config
 		+ pallet_authorship::Config,
 	pallet_treasury::Pallet<R>: OnUnbalanced<NegativeImbalance<R>>,
-	<R as frame_system::Config>::AccountId: From<common_primitives::AccountId>,
-	<R as frame_system::Config>::AccountId: Into<common_primitives::AccountId>,
+	<R as frame_system::Config>::AccountId: From<drml_common_primitives::AccountId>,
+	<R as frame_system::Config>::AccountId: Into<drml_common_primitives::AccountId>,
 	<R as frame_system::Config>::Event: From<darwinia_balances::Event<R, RingInstance>>,
 {
 	fn on_unbalanceds<B>(mut fees_then_tips: impl Iterator<Item = NegativeImbalance<R>>) {

diff --git a/node/runtime/common/src/lib.rs b/node/runtime/common/src/lib.rs
@@ -26,8 +26,7 @@ pub use impls::*;
 
 pub use frame_support::weights::constants::{ExtrinsicBaseWeight, RocksDbWeight};
 
-pub use darwinia_balances::Instance1 as RingInstance;
-pub use darwinia_balances::Instance2 as KtonInstance;
+pub use darwinia_balances::{Instance1 as RingInstance, Instance2 as KtonInstance};
 
 // --- crates.io ---
 use static_assertions::const_assert;
@@ -43,7 +42,7 @@ use frame_system::limits::{BlockLength, BlockWeights};
 use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 use sp_runtime::{FixedPointNumber, Perbill, Perquintill};
 // --- darwinia-network ---
-use common_primitives::BlockNumber;
+use drml_common_primitives::BlockNumber;
 
 pub type NegativeImbalance<T> = <darwinia_balances::Pallet<T, RingInstance> as Currency<
 	<T as frame_system::Config>::AccountId,

diff --git a/node/runtime/pangolin/Cargo.toml b/node/runtime/pangolin/Cargo.toml
@@ -18,8 +18,6 @@ serde             = { version = "1.0", optional = true }
 smallvec          = { version = "1.6" }
 static_assertions = { version = "1.1" }
 # darwinia-network
-bridge-primitives                       = { default-features = false, path = "../../primitives/bridge" }
-common-primitives                       = { default-features = false, path = "../../primitives/common" }
 common-runtime                          = { default-features = false, path = "../common" }
 darwinia-balances                       = { default-features = false, path = "../../../frame/balances" }
 darwinia-balances-rpc-runtime-api       = { default-features = false, path = "../../../frame/balances/rpc/runtime-api" }
@@ -50,6 +48,8 @@ dp-contract                             = { default-features = false, path = "..
 dp-evm                                  = { default-features = false, path = "../../../primitives/evm" }
 dp-fee                                  = { default-features = false, path = "../../../primitives/fee-market" }
 dp-s2s                                  = { default-features = false, path = "../../../primitives/s2s" }
+drml-bridge-primitives                  = { default-features = false, path = "../../primitives/bridge" }
+drml-common-primitives                  = { default-features = false, path = "../../primitives/common" }
 dvm-ethereum                            = { default-features = false, path = "../../../frame/dvm" }
 dvm-rpc-runtime-api                     = { default-features = false, path = "../../../frame/dvm/rpc/runtime-api" }
 ethereum-primitives                     = { default-features = false, path = "../../../primitives/ethereum" }
@@ -130,8 +130,6 @@ std = [
 	"evm/std",
 	"serde",
 	# darwinia-network
-	"bridge-primitives/std",
-	"common-primitives/std",
 	"common-runtime/std",
 	"darwinia-balances/std",
 	"darwinia-balances-rpc-runtime-api/std",
@@ -162,6 +160,8 @@ std = [
 	"dp-evm/std",
 	"dp-fee/std",
 	"dp-s2s/std",
+	"drml-bridge-primitives/std",
+	"drml-common-primitives/std",
 	"dvm-ethereum/std",
 	"dvm-rpc-runtime-api/std",
 	"ethereum-primitives/std",