wip: address todos and fix tests

centrifuge · Nov 1, 2023 · 49e880d · 49e880d
1 parent c489940
commit 49e880d
Show file tree

Hide file tree

Showing 31 changed files with 52 additions and 64 deletions.
diff --git a/libs/primitives/src/lib.rs b/libs/primitives/src/lib.rs
@@ -180,7 +180,6 @@ pub mod types {
 
 /// Common constants for all runtimes
 pub mod constants {
-	use cumulus_primitives_core::relay_chain::MAX_POV_SIZE;
 	use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight};
 	use sp_runtime::Perbill;
 
@@ -269,6 +268,10 @@ pub mod constants {
 
 	/// The safe XCM version of pallet-xcm, same as on relay chain
 	pub const SAFE_XCM_VERSION: u32 = xcm::opaque::v2::VERSION;
+
+	pub const MAX_POV_SIZE: u64 = cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64;
+	/// Block storage limit in bytes. Set to 40 KB.
+	pub const BLOCK_STORAGE_LIMIT: u64 = 40 * 1024;
 }
 
 /// Listing of parachains we integrate with.

diff --git a/pallets/anchors/src/mock.rs b/pallets/anchors/src/mock.rs
@@ -95,7 +95,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/block-rewards/src/mock.rs b/pallets/block-rewards/src/mock.rs
@@ -192,6 +192,7 @@ impl pallet_restricted_tokens::Config for Test {
 	type PreFungiblesMutate = cfg_traits::Always;
 	type PreFungiblesMutateHold = cfg_traits::Always;
 	type PreFungiblesTransfer = cfg_traits::Always;
+	type PreFungiblesUnbalanced = cfg_traits::Always;
 	type PreReservableCurrency = cfg_traits::Always;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();

diff --git a/pallets/bridge/src/mock.rs b/pallets/bridge/src/mock.rs
@@ -55,8 +55,6 @@ pub(crate) const RELAYER_A: u64 = 0x2;
 pub(crate) const RELAYER_B: u64 = 0x3;
 pub(crate) const RELAYER_C: u64 = 0x4;
 pub(crate) const ENDOWED_BALANCE: Balance = 10000 * CFG;
-//todo(nuno): if we AllowDeath in Fees::withdraw_fee, we don't need to add the
-// ED here
 pub(crate) const RELAYER_B_INITIAL_BALANCE: Balance =
 	NATIVE_TOKEN_TRANSFER_FEE + ExistentialDeposit::get();
 pub(crate) const TEST_RELAYER_VOTE_THRESHOLD: u32 = 2;
@@ -139,7 +137,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/collator-allowlist/src/mock.rs b/pallets/collator-allowlist/src/mock.rs
@@ -78,7 +78,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/crowdloan-claim/src/mock.rs b/pallets/crowdloan-claim/src/mock.rs
@@ -116,7 +116,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/crowdloan-reward/src/mock.rs b/pallets/crowdloan-reward/src/mock.rs
@@ -71,7 +71,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/ethereum-transaction/src/mock.rs b/pallets/ethereum-transaction/src/mock.rs
@@ -1,5 +1,6 @@
 use std::str::FromStr;
 
+use cfg_primitives::{BLOCK_STORAGE_LIMIT, MAX_POV_SIZE};
 use fp_evm::{FeeCalculator, Precompile, PrecompileResult};
 use frame_support::{parameter_types, traits::FindAuthor, weights::Weight};
 use pallet_ethereum::{IntermediateStateRoot, PostLogContent};
@@ -78,7 +79,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();
@@ -162,10 +163,6 @@ impl PrecompileSet for MockPrecompileSet {
 	}
 }
 
-const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
-/// Block storage limit in bytes. Set to 40 KB.
-const BLOCK_STORAGE_LIMIT: u64 = 40 * 1024;
-
 parameter_types! {
 	pub BlockGasLimit: U256 = U256::max_value();
 	pub WeightPerGas: Weight = Weight::from_parts(20_000, 0);
@@ -204,7 +201,6 @@ impl pallet_evm::Config for Runtime {
 
 parameter_types! {
 	pub const PostBlockAndTxnHashes: PostLogContent = PostLogContent::BlockAndTxnHashes;
-	//todo(nuno): revisit this
 	pub const ExtraDataLength: u32 = 30;
 }
 

diff --git a/pallets/fees/src/lib.rs b/pallets/fees/src/lib.rs
@@ -212,7 +212,6 @@ impl<T: Config> Pallet<T> {
 			from,
 			balance,
 			WithdrawReasons::FEE,
-			// todo(nuno): discuss whether we can make this AllowDeath instead
 			ExistenceRequirement::KeepAlive,
 		)
 	}

diff --git a/pallets/fees/src/mock.rs b/pallets/fees/src/mock.rs
@@ -113,7 +113,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/investments/src/mock.rs b/pallets/investments/src/mock.rs
@@ -128,7 +128,7 @@ impl pallet_balances::Config for MockRuntime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = MaxLocks;
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/keystore/src/mock.rs b/pallets/keystore/src/mock.rs
@@ -105,7 +105,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = MaxLocks;
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/liquidity-pools-gateway/routers/src/mock.rs b/pallets/liquidity-pools-gateway/routers/src/mock.rs
@@ -1,6 +1,7 @@
 use std::str::FromStr;
 
 use cfg_mocks::{pallet_mock_liquidity_pools, pallet_mock_routers, MessageMock, RouterMock};
+use cfg_primitives::{BLOCK_STORAGE_LIMIT, MAX_POV_SIZE};
 use cfg_traits::TryConvert;
 use cfg_types::domain_address::DomainAddress;
 use codec::{Decode, Encode};
@@ -233,10 +234,6 @@ impl PrecompileSet for MockPrecompileSet {
 	}
 }
 
-const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
-/// Block storage limit in bytes. Set to 40 KB.
-const BLOCK_STORAGE_LIMIT: u64 = 40 * 1024;
-
 parameter_types! {
 	pub BlockGasLimit: U256 = U256::max_value();
 	pub WeightPerGas: Weight = Weight::from_parts(20_000, 0);
@@ -275,7 +272,6 @@ impl pallet_evm::Config for Runtime {
 
 parameter_types! {
 	pub const PostBlockAndTxnHashes: PostLogContent = PostLogContent::BlockAndTxnHashes;
-	//todo(nuno): revisit this
 	pub const ExtraDataLength: u32 = 30;
 }
 

diff --git a/pallets/liquidity-pools-gateway/src/mock.rs b/pallets/liquidity-pools-gateway/src/mock.rs
@@ -79,7 +79,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/loans/src/tests/mock.rs b/pallets/loans/src/tests/mock.rs
@@ -161,7 +161,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/migration/src/mock.rs b/pallets/migration/src/mock.rs
@@ -21,7 +21,7 @@ use frame_support::{
 	parameter_types,
 	scale_info::TypeInfo,
 	sp_runtime::traits::ConvertInto,
-	traits::{Contains, InstanceFilter, WithdrawReasons},
+	traits::{ConstU32, Contains, InstanceFilter, WithdrawReasons},
 };
 use sp_core::{RuntimeDebug, H256};
 use sp_runtime::{
@@ -124,7 +124,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();
@@ -175,7 +175,7 @@ impl frame_system::Config for Runtime {
 	type Header = sp_runtime::generic::Header<BlockNumber, BlakeTwo256>;
 	type Index = Index;
 	type Lookup = IdentityLookup<Self::AccountId>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type MaxConsumers = ConstU32<16>;
 	type OnKilledAccount = ();
 	type OnNewAccount = ();
 	type OnSetCode = ();

diff --git a/pallets/nft-sales/src/mock.rs b/pallets/nft-sales/src/mock.rs
@@ -154,7 +154,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/nft/src/mock.rs b/pallets/nft/src/mock.rs
@@ -140,7 +140,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/order-book/src/mock.rs b/pallets/order-book/src/mock.rs
@@ -126,7 +126,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
@@ -183,6 +183,7 @@ impl pallet_restricted_tokens::Config for Runtime {
 	type PreFungiblesMutate = cfg_traits::Always;
 	type PreFungiblesMutateHold = cfg_traits::Always;
 	type PreFungiblesTransfer = cfg_traits::Always;
+	type PreFungiblesUnbalanced = cfg_traits::Always;
 	type PreReservableCurrency = cfg_traits::Always;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();

diff --git a/pallets/pool-registry/src/mock.rs b/pallets/pool-registry/src/mock.rs
@@ -422,7 +422,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = MaxLocks;
 	type MaxReserves = ();
 	type ReserveIdentifier = ();

diff --git a/pallets/pool-system/src/impls.rs b/pallets/pool-system/src/impls.rs
@@ -374,9 +374,7 @@ impl<T: Config> InvestmentAccountant<T::AccountId> for Pallet<T> {
 	) -> Result<(), Self::Error> {
 		let _details = Pool::<T>::get(id.of_pool()).ok_or(Error::<T>::NoSuchPool)?;
 
-		T::Tokens::mint_into(id.into(), buyer, amount).map(|_| ()) // todo(nuno):
-		                                                   // propagate this api
-		                                                   // change upstream
+		T::Tokens::mint_into(id.into(), buyer, amount).map(|_| ())
 	}
 
 	fn withdraw(

diff --git a/pallets/pool-system/src/mock.rs b/pallets/pool-system/src/mock.rs
@@ -154,7 +154,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = MaxLocks;
 	type MaxReserves = ();
 	type ReserveIdentifier = ();
@@ -216,6 +216,7 @@ impl pallet_restricted_tokens::Config for Runtime {
 	type PreFungiblesMutate = cfg_traits::Always;
 	type PreFungiblesMutateHold = cfg_traits::Always;
 	type PreFungiblesTransfer = cfg_traits::Always;
+	type PreFungiblesUnbalanced = cfg_traits::Always;
 	type PreReservableCurrency = cfg_traits::Always;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();

diff --git a/pallets/restricted-tokens/src/mock.rs b/pallets/restricted-tokens/src/mock.rs
@@ -450,7 +450,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ConstU32<50>;
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = MaxLocks;
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];

diff --git a/pallets/transfer-allowlist/src/mock.rs b/pallets/transfer-allowlist/src/mock.rs
@@ -153,7 +153,7 @@ impl pallet_balances::Config for Runtime {
 	type FreezeIdentifier = ();
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = ();
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];

diff --git a/runtime/altair/src/evm.rs b/runtime/altair/src/evm.rs
@@ -10,7 +10,10 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-use cfg_primitives::{EnsureRootOr, HalfOfCouncil, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO};
+use cfg_primitives::{
+	EnsureRootOr, HalfOfCouncil, BLOCK_STORAGE_LIMIT, MAXIMUM_BLOCK_WEIGHT, MAX_POV_SIZE,
+	NORMAL_DISPATCH_RATIO,
+};
 use frame_support::{parameter_types, traits::FindAuthor, weights::Weight, ConsensusEngineId};
 use pallet_ethereum::PostLogContent;
 use pallet_evm::{EnsureAddressRoot, EnsureAddressTruncated};
@@ -41,10 +44,6 @@ impl<F: FindAuthor<u32>> FindAuthor<H160> for FindAuthorTruncated<F> {
 	}
 }
 
-const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
-/// Block storage limit in bytes. Set to 40 KB.
-const BLOCK_STORAGE_LIMIT: u64 = 40 * 1024;
-
 parameter_types! {
 	pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT.ref_time() / WEIGHT_PER_GAS);
 	pub PrecompilesValue: Altair<Runtime> = Altair::<_>::new();
@@ -97,7 +96,6 @@ impl pallet_base_fee::Config for Runtime {
 
 parameter_types! {
 	pub const PostBlockAndTxnHashes: PostLogContent = PostLogContent::BlockAndTxnHashes;
-	//todo(nuno): revisit this
 	pub const ExtraDataLength: u32 = 30;
 }
 

diff --git a/runtime/altair/src/lib.rs b/runtime/altair/src/lib.rs
@@ -326,10 +326,9 @@ impl pallet_balances::Config for Runtime {
 	/// The minimum amount required to keep an account open.
 	type ExistentialDeposit = ExistentialDeposit;
 	type FreezeIdentifier = ();
-	//todo(nuno)
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = MaxLocks;
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];
@@ -678,7 +677,7 @@ parameter_types! {
 	pub const DesiredRunnersUp: u32 = 9;
 	pub const ElectionsPhragmenModuleId: LockIdentifier = *b"phrelect";
 	// todo(nuno)
-	pub const MaxVotesPerVoter: u32 = 5;
+	pub const MaxVotesPerVoter: u32 = 20;
 }
 
 // Make sure that there are no more than `MAX_MEMBERS` members elected via

diff --git a/runtime/centrifuge/src/evm.rs b/runtime/centrifuge/src/evm.rs
@@ -10,7 +10,10 @@
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
 
-use cfg_primitives::{TwoThirdOfCouncil, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO};
+use cfg_primitives::{
+	TwoThirdOfCouncil, BLOCK_STORAGE_LIMIT, MAXIMUM_BLOCK_WEIGHT, MAX_POV_SIZE,
+	NORMAL_DISPATCH_RATIO,
+};
 use frame_support::{parameter_types, traits::FindAuthor, weights::Weight, ConsensusEngineId};
 use pallet_ethereum::PostLogContent;
 use pallet_evm::{EnsureAddressRoot, EnsureAddressTruncated};
@@ -42,10 +45,6 @@ impl<F: FindAuthor<u32>> FindAuthor<H160> for FindAuthorTruncated<F> {
 	}
 }
 
-const MAX_POV_SIZE: u64 = 5 * 1024 * 1024;
-/// Block storage limit in bytes. Set to 40 KB.
-const BLOCK_STORAGE_LIMIT: u64 = 40 * 1024;
-
 parameter_types! {
 	pub BlockGasLimit: U256 = U256::from(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT.ref_time() / WEIGHT_PER_GAS);
 	pub PrecompilesValue: CentrifugePrecompiles<crate::Runtime> = CentrifugePrecompiles::<_>::new();

diff --git a/runtime/centrifuge/src/lib.rs b/runtime/centrifuge/src/lib.rs
@@ -473,7 +473,7 @@ impl pallet_balances::Config for Runtime {
 	//todo(nuno)
 	type HoldIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
+	type MaxHolds = frame_support::traits::ConstU32<1>;
 	type MaxLocks = MaxLocks;
 	type MaxReserves = MaxReserves;
 	type ReserveIdentifier = [u8; 8];