Fix and migrated benchmarking of lend-market from v1 to v2.

pallets/lend-market/src/mock.rs

@@ -506,3 +506,36 @@ pub const ACTIVE_MARKET_MOCK: Market<Balance> = {
 	market.state = MarketState::Active;
 	market
 };
+
+pub struct ExtBuilder {
+	balances: Vec<(AccountId, Balance)>,
+}
+
+impl Default for ExtBuilder {
+	fn default() -> Self {
+		Self { balances: vec![] }
+	}
+}
+
+impl ExtBuilder {
+	pub fn build(self) -> sp_io::TestExternalities {
+		let mut t = frame_system::GenesisConfig::<Test>::default()
+			.build_storage()
+			.unwrap();
+
+		pallet_balances::GenesisConfig::<Test> {
+			balances: self.balances.into_iter().collect::<Vec<_>>(),
+		}
+		.assimilate_storage(&mut t)
+		.unwrap();
+
+		let mut ext = sp_io::TestExternalities::new(t);
+		ext.execute_with(|| System::set_block_number(1));
+		ext
+	}
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+pub fn new_test_ext_benchmark() -> sp_io::TestExternalities {
+	ExtBuilder::default().build()
+}

runtime/bifrost-kusama/src/lib.rs

@@ -1712,7 +1712,7 @@ impl lend_market::Config for Runtime {
 	type OraclePriceProvider = Prices;
 	type ReserveOrigin = TechAdminOrCouncil;
 	type UpdateOrigin = TechAdminOrCouncil;
-	type WeightInfo = lend_market::weights::BifrostWeight<Runtime>;
+	type WeightInfo = weights::lend_market::BifrostWeight<Runtime>;
 	type UnixTime = Timestamp;
 	type Assets = Currencies;
 	type RewardAssetId = NativeCurrencyId;

runtime/bifrost-kusama/src/weights/mod.rs

@@ -39,6 +39,7 @@ pub mod bifrost_vstoken_conversion;
 pub mod bifrost_vtoken_minting;
 pub mod bifrost_vtoken_voting;
 pub mod bifrost_xcm_interface;
+pub mod lend_market;
 pub mod orml_oracle;
 pub mod orml_tokens;
 pub mod pallet_xcm;

runtime/bifrost-polkadot/src/lib.rs

@@ -1542,7 +1542,7 @@ impl lend_market::Config for Runtime {
 	type OraclePriceProvider = Prices;
 	type ReserveOrigin = TechAdminOrCouncil;
 	type UpdateOrigin = TechAdminOrCouncil;
-	type WeightInfo = lend_market::weights::BifrostWeight<Runtime>;
+	type WeightInfo = weights::lend_market::BifrostWeight<Runtime>;
 	type UnixTime = Timestamp;
 	type Assets = Currencies;
 	type RewardAssetId = NativeCurrencyId;

runtime/bifrost-polkadot/src/weights/mod.rs

@@ -41,6 +41,7 @@ pub mod bifrost_vstoken_conversion;
 pub mod bifrost_vtoken_minting;
 pub mod bifrost_vtoken_voting;
 pub mod bifrost_xcm_interface;
+pub mod lend_market;
 pub mod orml_oracle;
 pub mod orml_tokens;
 pub mod pallet_xcm;