nit: use traits::tokens::fungible => use traits::fungible (#1753)

Slightly less verbose use of fungible(s).

---------

Co-authored-by: Liam Aharon <liam.aharon@hotmail.com>
This commit is contained in:
Squirrel
2023-10-17 11:55:59 +02:00
committed by GitHub
parent 5cdd819ed2
commit d9e266f432
10 changed files with 16 additions and 16 deletions
@@ -1190,7 +1190,7 @@ pub fn create_and_manage_foreign_assets_for_local_consensus_parachain_assets_wor
.is_empty());
// check update metadata
use frame_support::traits::tokens::fungibles::roles::Inspect as InspectRoles;
use frame_support::traits::fungibles::roles::Inspect as InspectRoles;
assert_eq!(
<pallet_assets::Pallet<Runtime, ForeignAssetsPalletInstance>>::owner(
asset_id.into()
@@ -415,8 +415,8 @@ pub fn assert_metadata<Fungibles, AccountId>(
expected_symbol: &str,
expected_decimals: u8,
) where
Fungibles: frame_support::traits::tokens::fungibles::metadata::Inspect<AccountId>
+ frame_support::traits::tokens::fungibles::Inspect<AccountId>,
Fungibles: frame_support::traits::fungibles::metadata::Inspect<AccountId>
+ frame_support::traits::fungibles::Inspect<AccountId>,
{
assert_eq!(Fungibles::name(asset_id.into()), Vec::from(expected_name),);
assert_eq!(Fungibles::symbol(asset_id.into()), Vec::from(expected_symbol),);
@@ -428,8 +428,8 @@ pub fn assert_total<Fungibles, AccountId>(
expected_total_issuance: impl Into<Fungibles::Balance>,
expected_active_issuance: impl Into<Fungibles::Balance>,
) where
Fungibles: frame_support::traits::tokens::fungibles::metadata::Inspect<AccountId>
+ frame_support::traits::tokens::fungibles::Inspect<AccountId>,
Fungibles: frame_support::traits::fungibles::metadata::Inspect<AccountId>
+ frame_support::traits::fungibles::Inspect<AccountId>,
{
assert_eq!(Fungibles::total_issuance(asset_id.into()), expected_total_issuance.into());
assert_eq!(Fungibles::active_issuance(asset_id.into()), expected_active_issuance.into());
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
//! Adapters to work with `frame_support::traits::tokens::fungibles` through XCM.
//! Adapters to work with [`frame_support::traits::fungibles`] through XCM.
use frame_support::traits::{Contains, Get};
use sp_runtime::traits::MaybeEquivalence;
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
//! Adapters to work with `frame_support::traits::tokens::fungibles` through XCM.
//! Adapters to work with [`frame_support::traits::fungibles`] through XCM.
use frame_support::traits::{
tokens::{
@@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.
//! Adapters to work with `frame_support::traits::tokens::fungibles` through XCM.
//! Adapters to work with [`frame_support::traits::fungibles`] through XCM.
use crate::{AssetChecking, MintLocation};
use frame_support::{
+4 -4
View File
@@ -1328,7 +1328,7 @@ fn freezer_should_work() {
#[test]
fn imbalances_should_work() {
use frame_support::traits::tokens::fungibles::Balanced;
use frame_support::traits::fungibles::Balanced;
new_test_ext().execute_with(|| {
assert_ok!(Assets::force_create(RuntimeOrigin::root(), 0, 1, true, 1));
@@ -1591,7 +1591,7 @@ fn assets_from_genesis_should_exist() {
#[test]
fn querying_name_symbol_and_decimals_should_work() {
new_test_ext().execute_with(|| {
use frame_support::traits::tokens::fungibles::metadata::Inspect;
use frame_support::traits::fungibles::metadata::Inspect;
assert_ok!(Assets::force_create(RuntimeOrigin::root(), 0, 1, true, 1));
assert_ok!(Assets::force_set_metadata(
RuntimeOrigin::root(),
@@ -1610,7 +1610,7 @@ fn querying_name_symbol_and_decimals_should_work() {
#[test]
fn querying_allowance_should_work() {
new_test_ext().execute_with(|| {
use frame_support::traits::tokens::fungibles::approvals::{Inspect, Mutate};
use frame_support::traits::fungibles::approvals::{Inspect, Mutate};
assert_ok!(Assets::force_create(RuntimeOrigin::root(), 0, 1, true, 1));
assert_ok!(Assets::mint(RuntimeOrigin::signed(1), 0, 1, 100));
Balances::make_free_balance_be(&1, 2);
@@ -1635,7 +1635,7 @@ fn transfer_large_asset() {
#[test]
fn querying_roles_should_work() {
new_test_ext().execute_with(|| {
use frame_support::traits::tokens::fungibles::roles::Inspect;
use frame_support::traits::fungibles::roles::Inspect;
assert_ok!(Assets::force_create(RuntimeOrigin::root(), 0, 1, true, 1));
assert_ok!(Assets::set_team(
RuntimeOrigin::signed(1),
+1 -1
View File
@@ -26,7 +26,7 @@ use frame_support::{
dispatch::{DispatchInfo, GetDispatchInfo},
parameter_types,
traits::{
tokens::fungible, ConstU32, ConstU64, ConstU8, Imbalance as ImbalanceT, OnUnbalanced,
fungible, ConstU32, ConstU64, ConstU8, Imbalance as ImbalanceT, OnUnbalanced,
StorageMapShim, StoredMap, WhitelistedStorageKeys,
},
weights::{IdentityFee, Weight},
@@ -74,7 +74,7 @@ pub mod pallet {
type WeightInfo: WeightInfo;
/// This is a normal Rust type, nothing specific to FRAME here.
type Currency: frame_support::traits::tokens::fungible::Inspect<Self::AccountId>;
type Currency: frame_support::traits::fungible::Inspect<Self::AccountId>;
/// Similarly, let the runtime decide this.
fn some_function() -> u32;
@@ -354,7 +354,7 @@ impl<
Balance,
AssetIdType,
AssetId: Get<AssetIdType>,
Handler: crate::traits::tokens::fungibles::HandleImbalanceDrop<AssetIdType, Balance>,
Handler: crate::traits::fungibles::HandleImbalanceDrop<AssetIdType, Balance>,
> HandleImbalanceDrop<Balance>
for ConvertImbalanceDropHandler<AccountId, Balance, AssetIdType, AssetId, Handler>
{
@@ -48,7 +48,7 @@ use codec::{Decode, Encode};
use frame_support::{
dispatch::{DispatchInfo, DispatchResult, PostDispatchInfo},
traits::{
tokens::fungibles::{Balanced, Inspect},
fungibles::{Balanced, Inspect},
IsType,
},
DefaultNoBound,