git.delta.rocks / unique-network / refs/commits / b0b5098b9e8b

difftreelog

fix(rmrk) use derivative for enum defaults

Daniel Shiposha2022-06-02parent: #4b3d058.patch.diff
in: master

3 files changed

modifiedCargo.lockdiffbeforeafterboth
6329name = "pallet-rmrk-core"6329name = "pallet-rmrk-core"
6330version = "0.1.0"6330version = "0.1.0"
6331dependencies = [6331dependencies = [
6332 "derivative",
6332 "frame-benchmarking",6333 "frame-benchmarking",
6333 "frame-support",6334 "frame-support",
6334 "frame-system",6335 "frame-system",
modifiedpallets/proxy-rmrk-core/Cargo.tomldiffbeforeafterboth
23pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.22" }23pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.22" }
24frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }24frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.22" }
25scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }25scale-info = { version = "2.0.1", default-features = false, features = ["derive"] }
26derivative = { version = "2.2.0", features = ["use_core"] }
2627
27[features]28[features]
28default = ["std"]29default = ["std"]
modifiedpallets/proxy-rmrk-core/src/misc.rsdiffbeforeafterboth
1use super::*;1use super::*;
2use codec::{Encode, Decode};2use codec::{Encode, Decode};
3use derivative::Derivative;
34
4#[macro_export]5#[macro_export]
5macro_rules! map_common_err_to_proxy {6macro_rules! map_common_err_to_proxy {
49}50}
5051
51// todo remove default?52// todo remove default?
52#[derive(Encode, Decode, PartialEq, Eq, Default)]53#[derive(Encode, Decode, PartialEq, Eq, Derivative)]
54#[derivative(Default(bound=""))]
53pub enum NftType {55pub enum NftType {
54 #[default]56 #[derivative(Default)]
55 Regular,57 Regular,
56 Resource,58 Resource,
57 FixedPart,59 FixedPart,
60}62}
6163
62// todo remove default?64// todo remove default?
63#[derive(Encode, Decode, PartialEq, Eq, Default)]65#[derive(Encode, Decode, PartialEq, Eq, Derivative)]
66#[derivative(Default(bound=""))]
64pub enum ResourceType {67pub enum ResourceType {
65 #[default]68 #[derivative(Default)]
66 Basic,69 Basic,
67 Composable,70 Composable,
68 Slot,71 Slot,