Finalize CurrencyID<>MultiLocation tests

runtime/battery-station/src/integration_tests/mod.rs

@@ -16,4 +16,4 @@
 
 #![cfg(test)]
 
-mod xcm;
+mod xcm;

runtime/battery-station/src/integration_tests/xcm/restricted_calls.rs

@@ -0,0 +1 @@
+

runtime/battery-station/src/integration_tests/xcm/setup.rs

@@ -16,7 +16,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Zeitgeist. If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{AccountId, Balance, CurrencyId, Origin, Runtime, System, xcm_config::{asset_registry::CustomMetadata, config::zeitgeist}};
+use crate::{
+    xcm_config::{asset_registry::CustomMetadata, config::zeitgeist},
+    AccountId, Balance, CurrencyId, Origin, Runtime, System,
+};
 use frame_support::traits::GenesisBuild;
 use orml_traits::asset_registry::AssetMetadata;
 use zeitgeist_primitives::types::Asset;
@@ -30,115 +33,105 @@ pub const BOB: [u8; 32] = [5u8; 32];
 pub const PARA_ID_SIBLING: u32 = 3000;
 
 /// IDs that are used to represent tokens from other chains
-pub const FOREIGN_ZTG: Asset<u128> = CurrencyId::ForeignAsset(0);
-pub const FOREIGN_KSM: Asset<u128> = CurrencyId::ForeignAsset(1);
-pub const FOREIGN_SIBLING: Asset<u128> = CurrencyId::ForeignAsset(2);
-
+pub const FOREIGN_ZTG_ID: Asset<u128> = CurrencyId::ForeignAsset(0);
+pub const FOREIGN_KSM_ID: Asset<u128> = CurrencyId::ForeignAsset(1);
+pub const FOREIGN_SIBLING_ID: Asset<u128> = CurrencyId::ForeignAsset(2);
 
 pub struct ExtBuilder {
-	balances: Vec<(AccountId, CurrencyId, Balance)>,
-	parachain_id: u32,
+    balances: Vec<(AccountId, CurrencyId, Balance)>,
+    parachain_id: u32,
 }
 
 impl Default for ExtBuilder {
-	fn default() -> Self {
-		Self {
-			balances: vec![],
-			parachain_id: zeitgeist::ID,
-		}
-	}
+    fn default() -> Self {
+        Self { balances: vec![], parachain_id: zeitgeist::ID }
+    }
 }
 
 impl ExtBuilder {
-	pub fn balances(mut self, balances: Vec<(AccountId, CurrencyId, Balance)>) -> Self {
-		self.balances = balances;
-		self
-	}
-
-	pub fn parachain_id(mut self, parachain_id: u32) -> Self {
-		self.parachain_id = parachain_id;
-		self
-	}
-
-	pub fn build(self) -> sp_io::TestExternalities {
-		let mut t = frame_system::GenesisConfig::default()
-			.build_storage::<Runtime>()
-			.unwrap();
-		let native_currency_id = CurrencyId::Ztg;
-		pallet_balances::GenesisConfig::<Runtime> {
-			balances: self
-				.balances
-				.clone()
-				.into_iter()
-				.filter(|(_, currency_id, _)| *currency_id == native_currency_id)
-				.map(|(account_id, _, initial_balance)| (account_id, initial_balance))
-				.collect::<Vec<_>>(),
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		orml_tokens::GenesisConfig::<Runtime> {
-			balances: self
-				.balances
-				.into_iter()
-				.filter(|(_, currency_id, _)| *currency_id != native_currency_id)
-				.collect::<Vec<_>>(),
-		}
-		.assimilate_storage(&mut t)
-		.unwrap();
-
-		<parachain_info::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
-			&parachain_info::GenesisConfig {
-				parachain_id: self.parachain_id.into(),
-			},
-			&mut t,
-		)
-		.unwrap();
-
-		<pallet_xcm::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
-			&pallet_xcm::GenesisConfig {
-				safe_xcm_version: Some(2),
-			},
-			&mut t,
-		)
-		.unwrap();
-
-		let mut ext = sp_io::TestExternalities::new(t);
-		ext.execute_with(|| System::set_block_number(1));
-		ext
-	}
+    pub fn balances(mut self, balances: Vec<(AccountId, CurrencyId, Balance)>) -> Self {
+        self.balances = balances;
+        self
+    }
+
+    pub fn parachain_id(mut self, parachain_id: u32) -> Self {
+        self.parachain_id = parachain_id;
+        self
+    }
+
+    pub fn build(self) -> sp_io::TestExternalities {
+        let mut t = frame_system::GenesisConfig::default().build_storage::<Runtime>().unwrap();
+        let native_currency_id = CurrencyId::Ztg;
+        pallet_balances::GenesisConfig::<Runtime> {
+            balances: self
+                .balances
+                .clone()
+                .into_iter()
+                .filter(|(_, currency_id, _)| *currency_id == native_currency_id)
+                .map(|(account_id, _, initial_balance)| (account_id, initial_balance))
+                .collect::<Vec<_>>(),
+        }
+        .assimilate_storage(&mut t)
+        .unwrap();
+
+        orml_tokens::GenesisConfig::<Runtime> {
+            balances: self
+                .balances
+                .into_iter()
+                .filter(|(_, currency_id, _)| *currency_id != native_currency_id)
+                .collect::<Vec<_>>(),
+        }
+        .assimilate_storage(&mut t)
+        .unwrap();
+
+        <parachain_info::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
+            &parachain_info::GenesisConfig { parachain_id: self.parachain_id.into() },
+            &mut t,
+        )
+        .unwrap();
+
+        <pallet_xcm::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
+            &pallet_xcm::GenesisConfig { safe_xcm_version: Some(2) },
+            &mut t,
+        )
+        .unwrap();
+
+        let mut ext = sp_io::TestExternalities::new(t);
+        ext.execute_with(|| System::set_block_number(1));
+        ext
+    }
 }
 
 pub fn ztg(amount: Balance) -> Balance {
-	amount * dollar(10)
+    amount * dollar(10)
 }
 
 pub fn sibling(amount: Balance) -> Balance {
-	foreign(amount, 10)
+    foreign(amount, 10)
 }
 
 pub fn ksm(amount: Balance) -> Balance {
-	foreign(amount, 12)
+    foreign(amount, 12)
 }
 
 pub fn foreign(amount: Balance, decimals: u32) -> Balance {
-	amount * dollar(decimals)
+    amount * dollar(decimals)
 }
 
 pub fn dollar(decimals: u32) -> Balance {
-	10u128.saturating_pow(decimals.into())
+    10u128.saturating_pow(decimals.into())
 }
 
 pub fn sibling_account() -> AccountId {
-	parachain_account(PARA_ID_SIBLING.into())
+    parachain_account(PARA_ID_SIBLING.into())
 }
 
 pub fn zeitgeist_account() -> AccountId {
-	parachain_account(zeitgeist::ID)
+    parachain_account(zeitgeist::ID)
 }
 
 fn parachain_account(id: u32) -> AccountId {
-	use sp_runtime::traits::AccountIdConversion;
+    use sp_runtime::traits::AccountIdConversion;
 
-	polkadot_parachain::primitives::Sibling::from(id).into_account()
-}
+    polkadot_parachain::primitives::Sibling::from(id).into_account()
+}