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
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6329,6 +6329,7 @@
 name = "pallet-rmrk-core"
 version = "0.1.0"
 dependencies = [
+ "derivative",
  "frame-benchmarking",
  "frame-support",
  "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
--- a/pallets/proxy-rmrk-core/src/misc.rs
+++ b/pallets/proxy-rmrk-core/src/misc.rs
@@ -1,5 +1,6 @@
 use super::*;
 use codec::{Encode, Decode};
+use derivative::Derivative;
 
 #[macro_export]
 macro_rules! map_common_err_to_proxy {
@@ -49,9 +50,10 @@
 }
 
 // todo remove default?
-#[derive(Encode, Decode, PartialEq, Eq, Default)]
+#[derive(Encode, Decode, PartialEq, Eq, Derivative)]
+#[derivative(Default(bound=""))]
 pub enum NftType {
-	#[default]
+	#[derivative(Default)]
 	Regular,
 	Resource,
 	FixedPart,
@@ -60,9 +62,10 @@
 }
 
 // todo remove default?
-#[derive(Encode, Decode, PartialEq, Eq, Default)]
+#[derive(Encode, Decode, PartialEq, Eq, Derivative)]
+#[derivative(Default(bound=""))]
 pub enum ResourceType {
-	#[default]
+	#[derivative(Default)]
 	Basic,
 	Composable,
 	Slot,