Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
Add inspect trait for asset roles (#11738)
Browse files Browse the repository at this point in the history
Co-authored-by: Shawn Tabrizi <[email protected]>
  • Loading branch information
girazoki and shawntabrizi authored Sep 13, 2022
1 parent 379813c commit 5daa20c
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 0 deletions.
20 changes: 20 additions & 0 deletions frame/assets/src/impl_fungibles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,3 +263,23 @@ impl<T: Config<I>, I: 'static> fungibles::approvals::Mutate<<T as SystemConfig>:
Self::do_transfer_approved(asset, owner, delegate, dest, amount)
}
}

impl<T: Config<I>, I: 'static> fungibles::roles::Inspect<<T as SystemConfig>::AccountId>
for Pallet<T, I>
{
fn owner(asset: T::AssetId) -> Option<<T as SystemConfig>::AccountId> {
Asset::<T, I>::get(asset).map(|x| x.owner)
}

fn issuer(asset: T::AssetId) -> Option<<T as SystemConfig>::AccountId> {
Asset::<T, I>::get(asset).map(|x| x.issuer)
}

fn admin(asset: T::AssetId) -> Option<<T as SystemConfig>::AccountId> {
Asset::<T, I>::get(asset).map(|x| x.admin)
}

fn freezer(asset: T::AssetId) -> Option<<T as SystemConfig>::AccountId> {
Asset::<T, I>::get(asset).map(|x| x.freezer)
}
}
22 changes: 22 additions & 0 deletions frame/assets/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -977,3 +977,25 @@ fn transfer_large_asset() {
assert_ok!(Assets::transfer(Origin::signed(1), 0, 2, amount - 1));
})
}

#[test]
fn querying_roles_should_work() {
new_test_ext().execute_with(|| {
use frame_support::traits::tokens::fungibles::roles::Inspect;
assert_ok!(Assets::force_create(Origin::root(), 0, 1, true, 1));
assert_ok!(Assets::set_team(
Origin::signed(1),
0,
// Issuer
2,
// Admin
3,
// Freezer
4,
));
assert_eq!(Assets::owner(0), Some(1));
assert_eq!(Assets::issuer(0), Some(2));
assert_eq!(Assets::admin(0), Some(3));
assert_eq!(Assets::freezer(0), Some(4));
});
}
1 change: 1 addition & 0 deletions frame/support/src/traits/tokens/fungibles.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ pub mod metadata;
pub use balanced::{Balanced, Unbalanced};
mod imbalance;
pub use imbalance::{CreditOf, DebtOf, HandleImbalanceDrop, Imbalance};
pub mod roles;

/// Trait for providing balance-inspection access to a set of named fungible assets.
pub trait Inspect<AccountId> {
Expand Down
29 changes: 29 additions & 0 deletions frame/support/src/traits/tokens/fungibles/roles.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// This file is part of Substrate.

// Copyright (C) 2019-2022 Parity Technologies (UK) Ltd.
// SPDX-License-Identifier: Apache-2.0

// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

//! Inspect traits for Asset roles

pub trait Inspect<AccountId>: super::Inspect<AccountId> {
// Get owner for an AssetId.
fn owner(asset: Self::AssetId) -> Option<AccountId>;
// Get issuer for an AssetId.
fn issuer(asset: Self::AssetId) -> Option<AccountId>;
// Get admin for an AssetId.
fn admin(asset: Self::AssetId) -> Option<AccountId>;
// Get freezer for an AssetId.
fn freezer(asset: Self::AssetId) -> Option<AccountId>;
}

0 comments on commit 5daa20c

Please sign in to comment.