Migrate pallet-transaction-payment to new pallet attribute macro (p…

…aritytech#9087) * Migrate pallet-transaciont-payment to new pallet attribute macro Signed-off-by: koushiro <[email protected]> * remove generic from genesis config * fix test * fix tests * fix deprecated * fix tests Signed-off-by: koushiro <[email protected]> Co-authored-by: thiolliere <[email protected]> Co-authored-by: Keith Yeung <[email protected]>
canyon-network · Jun 25, 2021 · df50122 · df50122
1 parent bab9dec
commit df50122
Show file tree

Hide file tree

Showing 16 changed files with 185 additions and 128 deletions.
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
@@ -821,7 +821,7 @@ impl pallet_contracts::Config for Runtime {
 	type RentFraction = RentFraction;
 	type SurchargeReward = SurchargeReward;
 	type CallStack = [pallet_contracts::Frame<Self>; 31];
-	type WeightPrice = pallet_transaction_payment::Module<Self>;
+	type WeightPrice = pallet_transaction_payment::Pallet<Self>;
 	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;
 	type ChainExtension = ();
 	type DeletionQueueDepth = DeletionQueueDepth;

diff --git a/frame/balances/src/tests.rs b/frame/balances/src/tests.rs
@@ -26,7 +26,7 @@ macro_rules! decl_tests {
 		use crate::*;
 		use sp_runtime::{ArithmeticError, FixedPointNumber, traits::{SignedExtension, BadOrigin}};
 		use frame_support::{
-			assert_noop, assert_storage_noop, assert_ok, assert_err, StorageValue,
+			assert_noop, assert_storage_noop, assert_ok, assert_err,
 			traits::{
 				LockableCurrency, LockIdentifier, WithdrawReasons,
 				Currency, ReservableCurrency, ExistenceRequirement::AllowDeath
@@ -148,7 +148,9 @@ macro_rules! decl_tests {
 				.monied(true)
 				.build()
 				.execute_with(|| {
-					pallet_transaction_payment::NextFeeMultiplier::put(Multiplier::saturating_from_integer(1));
+					pallet_transaction_payment::NextFeeMultiplier::<$test>::put(
+						Multiplier::saturating_from_integer(1)
+					);
 					Balances::set_lock(ID_1, &1, 10, WithdrawReasons::RESERVE);
 					assert_noop!(
 						<Balances as Currency<_>>::transfer(&1, &2, 1, AllowDeath),

diff --git a/frame/balances/src/tests_composite.rs b/frame/balances/src/tests_composite.rs
@@ -43,6 +43,7 @@ frame_support::construct_runtime!(
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
 	}
 );
 

diff --git a/frame/balances/src/tests_local.rs b/frame/balances/src/tests_local.rs
@@ -45,6 +45,7 @@ frame_support::construct_runtime!(
 	{
 		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
 	}
 );
 

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
@@ -667,6 +667,7 @@ mod tests {
 		{
 			System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
 			Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+			TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
 			Custom: custom::{Pallet, Call, ValidateUnsigned, Inherent},
 		}
 	);
@@ -835,7 +836,7 @@ mod tests {
 				header: Header {
 					parent_hash: [69u8; 32].into(),
 					number: 1,
-					state_root: hex!("ec6bb58b0e4bc7fdf0151a0f601eb825f529fbf90b5be5b2024deba30c5cbbcb").into(),
+					state_root: hex!("1039e1a4bd0cf5deefe65f313577e70169c41c7773d6acf31ca8d671397559f5").into(),
 					extrinsics_root: hex!("03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c111314").into(),
 					digest: Digest { logs: vec![], },
 				},

diff --git a/frame/transaction-payment/Cargo.toml b/frame/transaction-payment/Cargo.toml
@@ -15,29 +15,31 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.101", optional = true }
-sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+smallvec = "1.4.1"
+
+sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
+sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = false }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../primitives/runtime" }
+sp-std = { version = "3.0.0", default-features = false, path = "../../primitives/std" }
+
 frame-support = { version = "3.0.0", default-features = false, path = "../support" }
 frame-system = { version = "3.0.0", default-features = false, path = "../system" }
-smallvec = "1.4.1"
-sp-io = { version = "3.0.0", path = "../../primitives/io", default-features = false }
-sp-core = { version = "3.0.0", path = "../../primitives/core", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.41"
-pallet-balances = { version = "3.0.0", path = "../balances" }
 sp-storage = { version = "3.0.0", path = "../../primitives/storage" }
+pallet-balances = { version = "3.0.0", path = "../balances" }
 
 [features]
 default = ["std"]
 std = [
 	"serde",
 	"codec/std",
-	"sp-std/std",
+	"sp-core/std",
+	"sp-io/std",
 	"sp-runtime/std",
+	"sp-std/std",
 	"frame-support/std",
 	"frame-system/std",
-	"sp-io/std",
-	"sp-core/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/frame/transaction-payment/README.md b/frame/transaction-payment/README.md
@@ -1,16 +1,16 @@
-# Transaction Payment Module
+# Transaction Payment Pallet
 
-This module provides the basic logic needed to pay the absolute minimum amount needed for a
+This pallet provides the basic logic needed to pay the absolute minimum amount needed for a
 transaction to be included. This includes:
   - _weight fee_: A fee proportional to amount of weight a transaction consumes.
   - _length fee_: A fee proportional to the encoded length of the transaction.
   - _tip_: An optional tip. Tip increases the priority of the transaction, giving it a higher
     chance to be included by the transaction queue.
 
-Additionally, this module allows one to configure:
+Additionally, this pallet allows one to configure:
   - The mapping between one unit of weight to one unit of fee via [`Config::WeightToFee`].
   - A means of updating the fee for the next block, via defining a multiplier, based on the
     final state of the chain at the end of the previous block. This can be configured via
     [`Config::FeeMultiplierUpdate`]
 
-License: Apache-2.0
+License: Apache-2.0
diff --git a/frame/transaction-payment/rpc/Cargo.toml b/frame/transaction-payment/rpc/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 license = "Apache-2.0"
 homepage = "https://substrate.dev"
 repository = "https://github.com/paritytech/substrate/"
-description = "RPC interface for the transaction payment module."
+description = "RPC interface for the transaction payment pallet."
 readme = "README.md"
 
 [package.metadata.docs.rs]
@@ -17,9 +17,10 @@ codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.1.0"
 jsonrpc-core-client = "15.1.0"
 jsonrpc-derive = "15.1.0"
+
+sp-api = { version = "3.0.0", path = "../../../primitives/api" }
+sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 sp-core = { version = "3.0.0", path = "../../../primitives/core" }
 sp-rpc = { version = "3.0.0", path = "../../../primitives/rpc" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }
-sp-api = { version = "3.0.0", path = "../../../primitives/api" }
-sp-blockchain = { version = "3.0.0", path = "../../../primitives/blockchain" }
 pallet-transaction-payment-rpc-runtime-api = { version = "3.0.0", path = "./runtime-api" }
diff --git a/frame/transaction-payment/rpc/README.md b/frame/transaction-payment/rpc/README.md
@@ -1,3 +1,3 @@
-RPC interface for the transaction payment module.
+RPC interface for the transaction payment pallet.
 
-License: Apache-2.0
+License: Apache-2.0
diff --git a/frame/transaction-payment/rpc/runtime-api/Cargo.toml b/frame/transaction-payment/rpc/runtime-api/Cargo.toml
@@ -13,16 +13,16 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
 codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
+sp-api = { version = "3.0.0", default-features = false, path = "../../../../primitives/api" }
 sp-runtime = { version = "3.0.0", default-features = false, path = "../../../../primitives/runtime" }
 pallet-transaction-payment = { version = "3.0.0", default-features = false, path = "../../../transaction-payment" }
 
 [features]
 default = ["std"]
 std = [
-	"sp-api/std",
 	"codec/std",
+	"sp-api/std",
 	"sp-runtime/std",
 	"pallet-transaction-payment/std",
 ]
diff --git a/frame/transaction-payment/rpc/runtime-api/README.md b/frame/transaction-payment/rpc/runtime-api/README.md
@@ -1,3 +1,3 @@
-Runtime API definition for transaction payment module.
+Runtime API definition for transaction payment pallet.
 
-License: Apache-2.0
+License: Apache-2.0
diff --git a/frame/transaction-payment/rpc/runtime-api/src/lib.rs b/frame/transaction-payment/rpc/runtime-api/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Runtime API definition for transaction payment module.
+//! Runtime API definition for transaction payment pallet.
 
 #![cfg_attr(not(feature = "std"), no_std)]
 

diff --git a/frame/transaction-payment/rpc/src/lib.rs b/frame/transaction-payment/rpc/src/lib.rs
@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! RPC interface for the transaction payment module.
+//! RPC interface for the transaction payment pallet.
 
 use std::sync::Arc;
 use std::convert::TryInto;