refactor: cleanup my leftovers (#1935)

centrifuge · Jul 31, 2024 · a38c4f9 · a38c4f9
1 parent d2118cb
commit a38c4f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 51 deletions.
diff --git a/pallets/liquidity-pools/src/tests.rs b/pallets/liquidity-pools/src/tests.rs
@@ -560,10 +560,7 @@ mod add_tranche {
 		#[test]
 		fn with_no_hook_address() {
 			System::externalities().execute_with(|| {
-				Permissions::mock_has(|_, _, _| true);
-				Pools::mock_pool_exists(|_| true);
-				Pools::mock_tranche_exists(|_, _| true);
-				AssetRegistry::mock_metadata(|_| Some(util::default_metadata()));
+				config_mocks();
 				Gateway::mock_get(|_| None);
 
 				assert_noop!(

diff --git a/runtime/integration-tests/src/cases/lp/setup_lp.rs b/runtime/integration-tests/src/cases/lp/setup_lp.rs
@@ -72,8 +72,7 @@ pub fn setup<T: Runtime, F: FnOnce(&mut <RuntimeEnv<T> as EnvEvmExtension<T>>::E
 			),
 			fee_values: FeeValues {
 				value: sp_core::U256::zero(),
-				// FIXME: Diverges from prod (500_000)
-				gas_limit: sp_core::U256::from(500_000_000),
+				gas_limit: sp_core::U256::from(500_000),
 				gas_price: sp_core::U256::from(base_fee),
 			},
 		};
@@ -283,21 +282,6 @@ pub fn setup_tranches<T: Runtime>(evm: &mut impl EvmEnv<T>) {
 			.value,
 		),
 	);
-	// FIXME: Fails
-	// evm.register(
-	// 	names::RM_POOL_A_T_1,
-	// 	contracts::RESTRICTION_MANAGER,
-	// 	Decoder::<H160>::decode(
-	// 		&evm.view(
-	// 			Keyring::Alice,
-	// 			names::POOL_A_T_1,
-	// 			"restrictionManager",
-	// 			None,
-	// 		)
-	// 		.unwrap()
-	// 		.value,
-	// 	),
-	// );
 
 	// AddTranche 1 of B
 	let tranche_id = {
@@ -341,21 +325,6 @@ pub fn setup_tranches<T: Runtime>(evm: &mut impl EvmEnv<T>) {
 			.value,
 		),
 	);
-	// FIXME: Fails
-	// evm.register(
-	// 	names::RM_POOL_B_T_1,
-	// 	contracts::RESTRICTION_MANAGER,
-	// 	Decoder::<H160>::decode(
-	// 		&evm.view(
-	// 			Keyring::Alice,
-	// 			names::POOL_B_T_1,
-	// 			"restrictionManager",
-	// 			None,
-	// 		)
-	// 		.unwrap()
-	// 		.value,
-	// 	),
-	// );
 
 	// AddTranche 2 of B
 	let tranche_id = {
@@ -399,21 +368,6 @@ pub fn setup_tranches<T: Runtime>(evm: &mut impl EvmEnv<T>) {
 			.value,
 		),
 	);
-	// FIXME: Fails
-	// evm.register(
-	// 	names::RM_POOL_B_T_2,
-	// 	contracts::RESTRICTION_MANAGER,
-	// 	Decoder::<H160>::decode(
-	// 		&evm.view(
-	// 			Keyring::Alice,
-	// 			names::POOL_B_T_2,
-	// 			"restrictionManager",
-	// 			None,
-	// 		)
-	// 		.unwrap()
-	// 		.value,
-	// 	),
-	// );
 
 	// AddTranche 1 of C
 	let tranche_id = {