Merge branch 'master' into client_tx_priority

Author: Roznovjak

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.41.0"
+version = "1.42.1"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"

integration-tests/Cargo.toml

@@ -90,12 +90,11 @@ impl HydrationTestDriver {
 
 	pub fn endow_account(&self, account: AccountId, asset_id: AssetId, amount: Balance) -> &Self {
 		self.execute(|| {
-			assert_ok!(Tokens::set_balance(
-				RawOrigin::Root.into(),
+			assert_ok!(Currencies::update_balance(
+				hydradx_runtime::RuntimeOrigin::root(),
 				account,
 				asset_id,
-				amount,
-				0
+				amount as i128,
 			));
 		});
 		self
@@ -197,6 +196,29 @@ impl HydrationTestDriver {
 		self.add_omnipool_assets(vec![HDX, DOT, WETH])
 	}
 
+	pub fn add_asset_to_omnipool(&self, asset_id: AssetId, initial_liquidity: Balance, price: FixedU128) -> &Self {
+		self.execute(|| {
+			let acc = hydradx_runtime::Omnipool::protocol_account();
+			assert_ok!(Tokens::set_balance(
+				RawOrigin::Root.into(),
+				acc.clone(),
+				asset_id,
+				initial_liquidity,
+				0
+			));
+
+			assert_ok!(hydradx_runtime::Omnipool::add_token(
+				hydradx_runtime::RuntimeOrigin::root(),
+				asset_id,
+				price,
+				Permill::from_percent(100),
+				AccountId::from(ALICE),
+			));
+		});
+
+		self
+	}
+
 	pub(crate) fn setup_stableswap(self) -> Self {
 		let mut stable_pool_id = 0;
 		let mut stable_assets = vec![];