Skip to content
This repository was archived by the owner on Mar 13, 2023. It is now read-only.

Commit 0cf6299

Browse files
boundless-forestboundless-forest
committed
Replace *
1 parent 9cec47a commit 0cf6299

6 files changed

Lines changed: 71 additions & 45 deletions

File tree

‎Cargo.lock‎

Lines changed: 0 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,23 @@ members = [
3737
"primitives/relayer-game",
3838
]
3939

40+
41+
[patch."https://github.com/darwinia-network/darwinia-messages-substrate"]
42+
pallet-bridge-dispatch = { path = "../darwinia-messages-substrate/modules/dispatch" }
43+
pallet-fee-market = { path = "../darwinia-messages-substrate/modules/fee-market" }
44+
pallet-bridge-grandpa = { path = "../darwinia-messages-substrate/modules/grandpa" }
45+
pallet-bridge-messages = { path = "../darwinia-messages-substrate/modules/messages" }
46+
pallet-bridge-parachains = { path = "../darwinia-messages-substrate/modules/parachains" }
47+
bp-runtime = { path = "../darwinia-messages-substrate/primitives/runtime" }
48+
bp-header-chain = { path = "../darwinia-messages-substrate/primitives/header-chain" }
49+
bp-pangolin = { path = "../darwinia-messages-substrate/primitives/chain-pangolin" }
50+
bp-rococo = { path = "../darwinia-messages-substrate/primitives/chain-rococo" }
51+
bp-pangoro = { path = "../darwinia-messages-substrate/primitives/chain-pangoro" }
52+
bp-pangolin-parachain = { path = "../darwinia-messages-substrate/primitives/chain-pangolin-parachain" }
53+
bp-messages = { path = "../darwinia-messages-substrate/primitives/messages" }
54+
bridge-runtime-common = { path = "../darwinia-messages-substrate/bin/runtime-common" }
55+
bp-message-dispatch = { path = "../darwinia-messages-substrate/primitives/message-dispatch" }
56+
4057
# The list of dependencies below (which can be both direct and indirect dependencies) are crates
4158
# that are suspected to be CPU-intensive, and that are unlikely to require debugging (as some of
4259
# their debug info might be missing) or to require to be frequently recompiled. We compile these

‎node/runtime/common/src/impls.rs‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,18 @@ use sp_npos_elections::ExtendedBalance;
3030
use sp_runtime::{traits::TrailingZeroInput, RuntimeDebug};
3131
// --- darwinia-network ---
3232
use crate::*;
33-
use bp_messages::{source_chain::*, *};
34-
use bridge_runtime_common::messages::{source::*, *};
35-
use drml_primitives::*;
33+
use bp_messages::{
34+
source_chain::{LaneMessageVerifier, Sender},
35+
LaneId, OutboundLaneData,
36+
};
37+
use bridge_runtime_common::messages::{
38+
source::{
39+
FromThisChainMessagePayload, BAD_ORIGIN, OUTBOUND_LANE_DISABLED, TOO_LOW_FEE,
40+
TOO_MANY_PENDING_MESSAGES,
41+
},
42+
AccountIdOf, BalanceOf, MessageBridge, ThisChain, ThisChainWithMessages,
43+
};
44+
use drml_primitives::AccountId;
3645

3746
darwinia_support::impl_account_data! {
3847
struct AccountData<Balance>

‎node/runtime/pangolin/src/bridges_message/pangolin_parachain.rs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,24 @@ use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128};
2828
use sp_std::ops::RangeInclusive;
2929
// --- darwinia-network ---
3030
use crate::*;
31-
use bp_messages::{source_chain::*, target_chain::*, *};
31+
use bp_messages::{
32+
source_chain::TargetHeaderChain,
33+
target_chain::{ProvedMessages, SourceHeaderChain},
34+
InboundLaneData, LaneId, Message, MessageNonce, Parameter,
35+
};
3236
use bp_rococo::parachains::ParaId;
33-
use bp_runtime::{ChainId, *};
37+
use bp_runtime::{Chain, ChainId, PANGOLIN_CHAIN_ID, PANGOLIN_PARACHAIN_CHAIN_ID};
3438
use bridge_runtime_common::{
35-
lanes::*,
39+
lanes::PANGOLIN_PANGOLIN_PARACHAIN_LANE,
3640
messages::{
3741
self,
38-
source::{self, *},
39-
target::{self, *},
40-
BalanceOf, *,
42+
source::{self, FromBridgedChainMessagesDeliveryProof, FromThisChainMessagePayload},
43+
target::{
44+
self, FromBridgedChainEncodedMessageCall, FromBridgedChainMessageDispatch,
45+
FromBridgedChainMessagePayload, FromBridgedChainMessagesProof,
46+
},
47+
BalanceOf, BridgedChainWithMessages, ChainWithMessages, MessageBridge, MessageTransaction,
48+
ThisChainWithMessages,
4149
},
4250
};
4351
use drml_common_runtime::impls::FromThisChainMessageVerifier;

‎node/runtime/pangolin/src/bridges_message/pangoro.rs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,23 @@ use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128};
3030
use sp_std::{ops::RangeInclusive, prelude::*};
3131
// --- darwinia-network ---
3232
use crate::*;
33-
use bp_messages::{source_chain::*, target_chain::*, *};
34-
use bp_runtime::{ChainId, *};
33+
use bp_messages::{
34+
source_chain::TargetHeaderChain,
35+
target_chain::{ProvedMessages, SourceHeaderChain},
36+
InboundLaneData, LaneId, Message, MessageNonce, Parameter,
37+
};
38+
use bp_runtime::{Chain, ChainId, PANGOLIN_CHAIN_ID, PANGORO_CHAIN_ID};
3539
use bridge_runtime_common::{
36-
lanes::*,
40+
lanes::PANGORO_PANGOLIN_LANE,
3741
messages::{
3842
self,
39-
source::{self, *},
40-
target::{self, *},
41-
BalanceOf, *,
43+
source::{self, FromBridgedChainMessagesDeliveryProof, FromThisChainMessagePayload},
44+
target::{
45+
self, FromBridgedChainEncodedMessageCall, FromBridgedChainMessageDispatch,
46+
FromBridgedChainMessagePayload, FromBridgedChainMessagesProof,
47+
},
48+
BalanceOf, BridgedChainWithMessages, ChainWithMessages, MessageBridge, MessageTransaction,
49+
ThisChainWithMessages,
4250
},
4351
};
4452
use drml_common_runtime::impls::FromThisChainMessageVerifier;
@@ -65,9 +73,6 @@ pub type FromPangoroEncodedCall = FromBridgedChainEncodedMessageCall<Call>;
6573
pub type FromPangoroMessageDispatch =
6674
FromBridgedChainMessageDispatch<WithPangoroMessageBridge, Runtime, Ring, WithPangoroDispatch>;
6775

68-
/// The s2s backing pallet index in the pangoro chain runtime.
69-
pub const PANGORO_S2S_BACKING_PALLET_INDEX: u8 = 20;
70-
7176
/// Initial value of `PangoroToPangolinConversionRate` parameter.
7277
pub const INITIAL_PANGORO_TO_PANGOLIN_CONVERSION_RATE: FixedU128 =
7378
FixedU128::from_inner(FixedU128::DIV);

‎node/runtime/pangoro/src/bridges_message/pangolin.rs‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,23 @@ use sp_runtime::{traits::Zero, FixedPointNumber, FixedU128};
3030
use sp_std::{ops::RangeInclusive, prelude::*};
3131
// --- darwinia-network ---
3232
use crate::*;
33-
use bp_messages::{source_chain::*, target_chain::*, *};
34-
use bp_runtime::{ChainId, *};
33+
use bp_messages::{
34+
source_chain::TargetHeaderChain,
35+
target_chain::{ProvedMessages, SourceHeaderChain},
36+
InboundLaneData, LaneId, Message, MessageNonce, Parameter,
37+
};
38+
use bp_runtime::{Chain, ChainId, PANGOLIN_CHAIN_ID, PANGORO_CHAIN_ID};
3539
use bridge_runtime_common::{
36-
lanes::*,
40+
lanes::PANGORO_PANGOLIN_LANE,
3741
messages::{
3842
self,
39-
source::{self, *},
40-
target::{self, *},
41-
BalanceOf, *,
43+
source::{self, FromBridgedChainMessagesDeliveryProof, FromThisChainMessagePayload},
44+
target::{
45+
self, FromBridgedChainEncodedMessageCall, FromBridgedChainMessageDispatch,
46+
FromBridgedChainMessagePayload, FromBridgedChainMessagesProof,
47+
},
48+
BalanceOf, BridgedChainWithMessages, ChainWithMessages, MessageBridge, MessageTransaction,
49+
ThisChainWithMessages,
4250
},
4351
};
4452
use drml_common_runtime::impls::FromThisChainMessageVerifier;
@@ -65,9 +73,6 @@ pub type FromPangolinEncodedCall = FromBridgedChainEncodedMessageCall<Call>;
6573
pub type FromPangolinMessageDispatch =
6674
FromBridgedChainMessageDispatch<WithPangolinMessageBridge, Runtime, Ring, WithPangolinDispatch>;
6775

68-
/// The s2s issuing pallet index in the pangolin chain runtime
69-
pub const PANGOLIN_S2S_ISSUING_PALLET_INDEX: u8 = 49;
70-
7176
/// Initial value of `PangolinToPangoroConversionRate` parameter.
7277
pub const INITIAL_PANGOLIN_TO_PANGORO_CONVERSION_RATE: FixedU128 =
7378
FixedU128::from_inner(FixedU128::DIV);

0 commit comments

Comments
 (0)