refactor: enums

pallets/api/src/fungibles/mod.rs

@@ -193,8 +193,8 @@ pub mod pallet {
 
 			match key {
 				TotalSupply(id) => AssetsOf::<T>::total_supply(id).encode(),
-				BalanceOf(id, owner) => AssetsOf::<T>::balance(id, owner).encode(),
-				Allowance(id, owner, spender) => {
+				BalanceOf { id, owner } => AssetsOf::<T>::balance(id, owner).encode(),
+				Allowance { id, owner, spender } => {
 					AssetsOf::<T>::allowance(id, &owner, &spender).encode()
 				},
 				TokenName(id) => {

pallets/api/src/fungibles/tests.rs

@@ -71,7 +71,7 @@ fn balance_of_works() {
 		create_asset_and_mint_to(ALICE, ASSET, ALICE, 100);
 		assert_eq!(
 			Assets::balance(ASSET, ALICE).encode(),
-			Fungibles::read_state(BalanceOf(ASSET, ALICE))
+			Fungibles::read_state(BalanceOf { id: ASSET, owner: ALICE })
 		);
 	});
 }
@@ -82,7 +82,7 @@ fn allowance_works() {
 		create_asset_mint_and_approve(ALICE, ASSET, BOB, 100, ALICE, 50);
 		assert_eq!(
 			Assets::allowance(ASSET, &ALICE, &BOB).encode(),
-			Fungibles::read_state(Allowance(ASSET, ALICE, BOB))
+			Fungibles::read_state(Allowance { id: ASSET, owner: ALICE, spender: BOB })
 		);
 	});
 }

runtime/devnet/src/config/api.rs

@@ -25,15 +25,15 @@ impl Contains<RuntimeCall> for AllowedApiCalls {
 	}
 }
 
-impl<T: fungibles::Config> Contains<RuntimeStateKeys<T>> for AllowedApiCalls {
+impl<T: fungibles::Config> Contains<RuntimeRead<T>> for AllowedApiCalls {
 	/// Allowed state queries from the API.
-	fn contains(c: &RuntimeStateKeys<T>) -> bool {
+	fn contains(c: &RuntimeRead<T>) -> bool {
 		use fungibles::Read::*;
 		matches!(
 			c,
-			RuntimeStateKeys::Fungibles(
+			RuntimeRead::Fungibles(
 				TotalSupply(..)
-					| BalanceOf(..) | Allowance(..)
+					| BalanceOf { .. } | Allowance { .. }
 					| TokenName(..) | TokenSymbol(..)
 					| TokenDecimals(..)
 			)

runtime/devnet/src/extensions/mod.rs

@@ -5,10 +5,7 @@ use crate::{
 		api::{AllowedApiCalls, RuntimeRead},
 		assets::TrustBackedAssetsInstance,
 	},
-	fungibles::{
-		self,
-		Read::{self, *},
-	},
+	fungibles::{self},
 	AccountId, RuntimeCall, RuntimeOrigin,
 };
 use codec::{Decode, Encode};
@@ -183,7 +180,7 @@ where
 		VersionedStateRead::V0(key) => {
 			ensure!(AllowedApiCalls::contains(&key), DispatchError::Other("UnknownCall"));
 			match key {
-				RuntimeStateKeys::Fungibles(key) => fungibles::Pallet::<T>::read_state(key),
+				RuntimeRead::Fungibles(key) => fungibles::Pallet::<T>::read_state(key),
 			}
 		},
 	};

runtime/devnet/src/lib.rs

@@ -11,7 +11,6 @@ mod weights;
 // Public due to integration tests crate.
 pub mod config;
 
-use codec::{Decode, Encode, MaxEncodedLen};
 use cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
 use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
 use smallvec::smallvec;