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

Use Incrementable from frame_support::traits #14367

Merged
merged 2 commits into from
Jun 13, 2023
Merged

Use Incrementable from frame_support::traits #14367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb22d96
Use Incrementable from frame_support::traits
jsidorenko Jun 13, 2023
c74e0aa
Chore
jsidorenko Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion frame/nfts/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ pub mod weights;

use codec::{Decode, Encode};
use frame_support::traits::{
tokens::Locker, BalanceStatus::Reserved, Currency, EnsureOriginWithArg, ReservableCurrency,
tokens::Locker, BalanceStatus::Reserved, Currency, EnsureOriginWithArg, Incrementable,
ReservableCurrency,
};
use frame_system::Config as SystemConfig;
use sp_runtime::{
Expand Down
19 changes: 0 additions & 19 deletions frame/nfts/src/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.

macro_rules! impl_incrementable {
($($type:ty),+) => {
$(
impl Incrementable for $type {
fn increment(&self) -> Self {
let mut val = self.clone();
val.saturating_inc();
val
}

fn initial_value() -> Self {
0
}
}
)+
};
}
pub(crate) use impl_incrementable;

macro_rules! impl_codec_bitflags {
($wrapper:ty, $size:ty, $bitflag_enum:ty) => {
impl MaxEncodedLen for $wrapper {
Expand Down
6 changes: 0 additions & 6 deletions frame/nfts/src/types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ pub(super) type PreSignedAttributesOf<T, I = ()> = PreSignedAttributes<
<T as SystemConfig>::BlockNumber,
>;

pub trait Incrementable {
fn increment(&self) -> Self;
fn initial_value() -> Self;
}
impl_incrementable!(u8, u16, u32, u64, u128, i8, i16, i32, i64, i128);

/// Information about a collection.
#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen)]
pub struct CollectionDetails<AccountId, DepositBalance> {
Expand Down