Skip to content

Commit 7099f6e

Browse files
codekitzcodekitz
authored
Removes as [disambiguation_path] from derive_impl usage (#3652)
Step in paritytech/polkadot-sdk#171 This PR removes `as [disambiguation_path]` syntax from `derive_impl` usage across the polkadot-sdk as introduced in paritytech/polkadot-sdk#3505
1 parent 3c6ebd9 commit 7099f6e

File tree

212 files changed

+244
-241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+244
-241
lines changed

‎bridges/bin/runtime-common/src/mock.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ parameter_types! {
141141
pub const ReserveId: [u8; 8] = *b"brdgrlrs";
142142
}
143143

144-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
144+
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
145145
impl frame_system::Config for TestRuntime {
146146
type Hash = ThisChainHash;
147147
type Hashing = ThisChainHasher;
@@ -158,12 +158,13 @@ impl pallet_utility::Config for TestRuntime {
158158
type WeightInfo = ();
159159
}
160160

161-
#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
161+
#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
162162
impl pallet_balances::Config for TestRuntime {
163163
type ReserveIdentifier = [u8; 8];
164164
type AccountStore = System;
165165
}
166166

167+
#[derive_impl(pallet_transaction_payment::config_preludes::TestDefaultConfig)]
167168
impl pallet_transaction_payment::Config for TestRuntime {
168169
type OnChargeTransaction = pallet_transaction_payment::CurrencyAdapter<Balances, ()>;
169170
type OperationalFeeMultiplier = ConstU8<5>;

‎bridges/modules/grandpa/src/mock.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ construct_runtime! {
4242
}
4343
}
4444

45-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
45+
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
4646
impl frame_system::Config for TestRuntime {
4747
type Block = Block;
4848
}

‎bridges/modules/messages/src/mock.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,14 @@ frame_support::construct_runtime! {
7777

7878
pub type DbWeight = RocksDbWeight;
7979

80-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
80+
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
8181
impl frame_system::Config for TestRuntime {
8282
type Block = Block;
8383
type AccountData = pallet_balances::AccountData<Balance>;
8484
type DbWeight = DbWeight;
8585
}
8686

87-
#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
87+
#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
8888
impl pallet_balances::Config for TestRuntime {
8989
type ReserveIdentifier = [u8; 8];
9090
type AccountStore = System;

‎bridges/modules/parachains/src/mock.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ construct_runtime! {
161161
}
162162
}
163163

164-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
164+
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
165165
impl frame_system::Config for TestRuntime {
166166
type Block = Block;
167167
}

‎bridges/modules/relayers/src/mock.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ parameter_types! {
5959
pub const Lease: BlockNumber = 8;
6060
}
6161

62-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
62+
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
6363
impl frame_system::Config for TestRuntime {
6464
type Block = Block;
6565
type AccountData = pallet_balances::AccountData<Balance>;
6666
type DbWeight = DbWeight;
6767
}
6868

69-
#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
69+
#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
7070
impl pallet_balances::Config for TestRuntime {
7171
type ReserveIdentifier = [u8; 8];
7272
type AccountStore = System;

‎bridges/modules/xcm-bridge-hub-router/src/mock.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ parameter_types! {
6464
pub UnknownXcmVersionLocation: Location = Location::new(2, [GlobalConsensus(BridgedNetworkId::get()), Parachain(9999)]);
6565
}
6666

67-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
67+
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
6868
impl frame_system::Config for TestRuntime {
6969
type Block = Block;
7070
}

‎bridges/modules/xcm-bridge-hub/src/mock.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ parameter_types! {
6464
pub const ExistentialDeposit: Balance = 1;
6565
}
6666

67-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
67+
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
6868
impl frame_system::Config for TestRuntime {
6969
type AccountId = AccountId;
7070
type AccountData = pallet_balances::AccountData<Balance>;
7171
type Block = Block;
7272
type Lookup = IdentityLookup<Self::AccountId>;
7373
}
7474

75-
#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
75+
#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig)]
7676
impl pallet_balances::Config for TestRuntime {
7777
type AccountStore = System;
7878
}

‎bridges/snowbridge/pallets/ethereum-client/src/mock.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ frame_support::construct_runtime!(
9595
}
9696
);
9797

98-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
98+
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
9999
impl frame_system::Config for Test {
100100
type Block = Block;
101101
}

‎bridges/snowbridge/pallets/inbound-queue/src/mock.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ parameter_types! {
4747

4848
type Balance = u128;
4949

50-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
50+
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
5151
impl frame_system::Config for Test {
5252
type BaseCallFilter = Everything;
5353
type RuntimeOrigin = RuntimeOrigin;

‎bridges/snowbridge/pallets/outbound-queue/src/mock.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ parameter_types! {
3737
pub const BlockHashCount: u64 = 250;
3838
}
3939

40-
#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
40+
#[derive_impl(frame_system::config_preludes::TestDefaultConfig)]
4141
impl frame_system::Config for Test {
4242
type BaseCallFilter = Everything;
4343
type RuntimeOrigin = RuntimeOrigin;

0 commit comments

Comments
 (0)