fix fee-control and fee-proxy mocks

futureversecom · Jan 16, 2025 · af9e8f6 · af9e8f6
1 parent 48c0995
commit af9e8f6
Show file tree

Hide file tree

Showing 7 changed files with 89 additions and 1 deletion.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallet/common/Cargo.toml b/pallet/common/Cargo.toml
@@ -17,6 +17,7 @@ scale-info = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-benchmarking = { workspace = true, optional = true }
+fp-self-contained = { workspace = true, default-features = true }
 sp-core = { workspace = true }
 sp-std = { workspace = true }
 sp-runtime = { workspace = true }

diff --git a/pallet/common/src/test_utils.rs b/pallet/common/src/test_utils.rs
@@ -36,7 +36,7 @@ pub mod test_prelude {
 	pub use sp_core::{H160, H256, U256};
 	pub use sp_runtime::{
 		testing::Header,
-		traits::{BlakeTwo256, IdentityLookup},
+		traits::{BlakeTwo256, IdentityLookup, LookupError, StaticLookup},
 		ArithmeticError, BoundedVec, BuildStorage,
 		DispatchError::BadOrigin,
 		Permill, TokenError,
@@ -747,3 +747,65 @@ macro_rules! impl_pallet_sylo_config {
 		}
 	};
 }
+
+#[macro_export]
+macro_rules! impl_pallet_xrpl_config {
+	($test:ident) => {
+		pub struct FuturepassIdentityLookup;
+		impl StaticLookup for FuturepassIdentityLookup {
+			type Source = H160;
+			type Target = H160;
+			fn lookup(s: Self::Source) -> Result<Self::Target, LookupError> {
+				Ok(s)
+			}
+			fn unlookup(t: Self::Target) -> Self::Source {
+				t
+			}
+		}
+		impl ExtrinsicChecker for FuturepassIdentityLookup {
+			type Call = RuntimeCall;
+			type Extra = ();
+			type Result = bool;
+			fn check_extrinsic(_call: &Self::Call, _extra: &Self::Extra) -> Self::Result {
+				false
+			}
+		}
+
+		pub struct ValidatedCall;
+		impl ExtrinsicChecker for ValidatedCall {
+			type Call = RuntimeCall;
+			type Extra = ();
+			type Result = bool;
+			fn check_extrinsic(_call: &Self::Call, _extra: &Self::Extra) -> Self::Result {
+				true
+			}
+		}
+
+		parameter_types! {
+			pub const MaxMessageLength: u32 = 2048;
+			pub const MaxSignatureLength: u32 = 80;
+		}
+		impl pallet_xrpl::Config for Test {
+			type RuntimeEvent = RuntimeEvent;
+			type RuntimeCall = RuntimeCall;
+			type CallValidator = ValidatedCall;
+			type FuturepassLookup = FuturepassIdentityLookup;
+			type PalletsOrigin = OriginCaller;
+			type MaxMessageLength = MaxMessageLength;
+			type MaxSignatureLength = MaxSignatureLength;
+			type WeightInfo = ();
+		}
+	};
+}
+
+#[macro_export]
+macro_rules! impl_pallet_utility_config {
+	($test:ident) => {
+		impl pallet_utility::Config for Test {
+			type RuntimeEvent = RuntimeEvent;
+			type RuntimeCall = RuntimeCall;
+			type PalletsOrigin = OriginCaller;
+			type WeightInfo = ();
+		}
+	};
+}
diff --git a/pallet/fee-control/Cargo.toml b/pallet/fee-control/Cargo.toml
@@ -39,6 +39,9 @@ pallet-dex = { workspace = true }
 pallet-assets-ext = { workspace = true }
 pallet-futurepass = { workspace = true }
 pallet-sylo = { workspace = true }
+pallet-xrpl = { workspace = true }
+pallet-proxy = { workspace = true }
+pallet-utility = { workspace = true }
 seed-pallet-common= { workspace = true, default-features = true }
 
 [features]
@@ -50,6 +53,8 @@ std = [
 	"frame-system/std",
 	"pallet-assets/std",
 	"pallet-balances/std",
+	"pallet-proxy/std",
+	"pallet-utility/std",
 	"sp-runtime/std",
 	"sp-std/std",
 	"seed-pallet-common/std",

diff --git a/pallet/fee-control/src/mock.rs b/pallet/fee-control/src/mock.rs
@@ -22,6 +22,8 @@ use frame_support::{
 use pallet_evm::{AddressMapping, BlockHashMapping, EnsureAddressNever, GasWeightMapping};
 use precompile_utils::{Address, ErcIdConversion};
 use seed_pallet_common::test_prelude::*;
+use seed_pallet_common::ExtrinsicChecker;
+use sp_runtime::traits::{LookupError, StaticLookup};
 use sp_runtime::ConsensusEngineId;
 
 pub const MOCK_PAYMENT_ASSET_ID: AssetId = 100;
@@ -41,6 +43,9 @@ construct_runtime!(
 		Futurepass: pallet_futurepass,
 		Sylo: pallet_sylo,
 		MockPallet: mock_pallet::pallet,
+		Xrpl: pallet_xrpl,
+		Utility: pallet_utility,
+		Proxy: pallet_proxy,
 		FeeControl: pallet_fee_control,
 	}
 );
@@ -56,6 +61,9 @@ impl_pallet_timestamp_config!(Test);
 impl_pallet_evm_config!(Test);
 impl_pallet_futurepass_config!(Test);
 impl_pallet_sylo_config!(Test);
+impl_pallet_xrpl_config!(Test);
+impl_pallet_proxy_config!(Test);
+impl_pallet_utility_config!(Test);
 impl_pallet_fee_control_config!(Test);
 
 impl mock_pallet::pallet::Config for Test {}

diff --git a/pallet/fee-proxy/Cargo.toml b/pallet/fee-proxy/Cargo.toml
@@ -48,6 +48,8 @@ std = [
     "precompile-utils/std",
     "pallet-assets-ext/std",
     "pallet-futurepass/std",
+    "pallet-proxy/std",
+	"pallet-utility/std",
     "pallet-evm/std",
     "pallet-sylo/std",
     "pallet-transaction-payment/std",

diff --git a/pallet/fee-proxy/src/mock.rs b/pallet/fee-proxy/src/mock.rs
@@ -41,6 +41,9 @@ construct_runtime!(
 		Futurepass: pallet_futurepass,
 		FeeControl: pallet_fee_control,
 		Sylo: pallet_sylo,
+		Xrpl: pallet_xrpl,
+		Utility: pallet_utility,
+		Proxy: pallet_proxy,
 	}
 );
 
@@ -55,6 +58,9 @@ impl_pallet_evm_config!(Test);
 impl_pallet_futurepass_config!(Test);
 impl_pallet_fee_control_config!(Test);
 impl_pallet_sylo_config!(Test);
+impl_pallet_xrpl_config!(Test);
+impl_pallet_proxy_config!(Test);
+impl_pallet_utility_config!(Test);
 
 // Mock ErcIdConversion for testing purposes
 impl<RuntimeId> ErcIdConversion<RuntimeId> for Test