Concrete fungible ledger integration tests

pallets/manta-pay/src/lib.rs

@@ -252,7 +252,7 @@ pub mod pallet {
 	pub enum Event<T: Config> {
 		/// Public Transfer Event
 		Transfer {
-			/// Asset Transfered
+			/// Asset Transferred
 			asset: Asset,
 
 			/// Source Account
@@ -302,7 +302,7 @@ pub mod pallet {
 
 		/// Balance Low
 		///
-		/// Attempted to withdraw from balance which was smaller than the withdrawl amount.
+		/// Attempted to withdraw from balance which was smaller than the withdrawal amount.
 		BalanceLow,
 
 		/// Invalid Serialized Form
@@ -450,7 +450,7 @@ pub mod pallet {
 				FungibleLedgerError::ReducedToZero(_) => Self::PublicUpdateReducedToZero,
 				FungibleLedgerError::NoFunds => Self::PublicUpdateNoFunds,
 				FungibleLedgerError::WouldDie => Self::PublicUpdateWouldDie,
-				FungibleLedgerError::InvalidTransfer => Self::PublicUpdateInvalidTransfer,
+				FungibleLedgerError::InvalidTransfer(_e) => Self::PublicUpdateInvalidTransfer,
 				_ => Self::InternalLedgerError,
 			}
 		}

primitives/src/assets.rs

@@ -32,7 +32,7 @@ use frame_support::{
 };
 use scale_info::TypeInfo;
 use sp_core::H160;
-use sp_runtime::{traits::Member, DispatchResult};
+use sp_runtime::{traits::Member, DispatchError, DispatchResult};
 use sp_std::{borrow::Borrow, marker::PhantomData, prelude::Vec};
 use xcm::{
 	v1::{Junctions, MultiLocation},
@@ -250,14 +250,14 @@ where
 }
 
 /// Fungible Ledger Error
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum FungibleLedgerError {
 	/// Invalid Asset Id
 	InvalidAssetId,
 
 	/// Deposit couldn't happen due to the amount being too low. This is usually because the
 	/// account doesn't yet exist and the deposit wouldn't bring it to at least the minimum needed
-	/// for existance.
+	/// for existence.
 	BelowMinimum,
 
 	/// Deposit cannot happen since the account cannot be created (usually because it's a consumer
@@ -294,10 +294,10 @@ pub enum FungibleLedgerError {
 	WouldDie,
 
 	/// Unable to Mint an Asset
-	InvalidMint,
+	InvalidMint(DispatchError),
 
 	/// Unable to Transfer an Asset
-	InvalidTransfer,
+	InvalidTransfer(DispatchError),
 }
 
 impl FungibleLedgerError {
@@ -439,7 +439,7 @@ where
 			<Native as Currency<C::AccountId>>::deposit_creating(beneficiary, amount);
 		} else {
 			<NonNative as Mutate<C::AccountId>>::mint_into(asset_id, beneficiary, amount)
-				.map_err(|_| FungibleLedgerError::InvalidMint)?;
+				.map_err(|e| FungibleLedgerError::InvalidMint(e))?;
 		}
 		Ok(())
 	}
@@ -469,6 +469,6 @@ where
 			)
 			.map(|_| ())
 		}
-		.map_err(|_| FungibleLedgerError::InvalidTransfer)
+		.map_err(|e| FungibleLedgerError::InvalidTransfer(e))
 	}
 }

runtime/calamari/src/lib.rs

@@ -684,6 +684,9 @@ parameter_types! {
 	pub const AssetManagerPalletId: PalletId = ASSET_MANAGER_PALLET_ID;
 }
 
+pub type CalamariConcreteFungibleLedger =
+	ConcreteFungibleLedger<Runtime, CalamariAssetConfig, Balances, Assets>;
+
 #[derive(Clone, Eq, PartialEq)]
 pub struct CalamariAssetConfig;
 
@@ -697,7 +700,7 @@ impl AssetConfig<Runtime> for CalamariAssetConfig {
 	type StorageMetadata = AssetStorageMetadata;
 	type AssetLocation = AssetLocation;
 	type AssetRegistrar = CalamariAssetRegistrar;
-	type FungibleLedger = ConcreteFungibleLedger<Runtime, CalamariAssetConfig, Balances, Assets>;
+	type FungibleLedger = CalamariConcreteFungibleLedger;
 }
 
 impl pallet_asset_manager::Config for Runtime {

runtime/calamari/tests/common/mock.rs

@@ -17,11 +17,12 @@
 use crate::common::*;
 
 pub use calamari_runtime::{
-	currency::KMA, Call, CollatorSelection, Democracy, Runtime, Scheduler, Session, System,
-	TransactionPayment,
+	currency::KMA, CalamariAssetConfig, Call, CollatorSelection, Democracy, Runtime, Scheduler,
+	Session, System, TransactionPayment,
 };
 use frame_support::traits::{GenesisBuild, OnFinalize, OnInitialize};
 use manta_primitives::{
+	assets::AssetConfig,
 	helpers::{get_account_id_from_seed, get_collator_keys_from_seed},
 	types::{AccountId, AuraId, Balance},
 };
@@ -33,6 +34,7 @@ pub struct ExtBuilder {
 	desired_candidates: u32,
 	safe_xcm_version: Option<u32>,
 }
+use sp_std::marker::PhantomData;
 
 impl Default for ExtBuilder {
 	fn default() -> ExtBuilder {
@@ -113,6 +115,13 @@ impl ExtBuilder {
 		.assimilate_storage(&mut t)
 		.unwrap();
 
+		pallet_asset_manager::GenesisConfig::<Runtime> {
+			start_id: <CalamariAssetConfig as AssetConfig<Runtime>>::StartNonNativeAssetId::get(),
+			_marker: PhantomData::<Runtime>::default(),
+		}
+		.assimilate_storage(&mut t)
+		.unwrap();
+
 		<pallet_xcm::GenesisConfig as GenesisBuild<Runtime>>::assimilate_storage(
 			&pallet_xcm::GenesisConfig {
 				safe_xcm_version: self.safe_xcm_version,