git.delta.rocks / unique-network / refs/commits / 1bdec8235cab

difftreelog

fix export RpcCollection to metadata

Yaroslav Bolyukin2022-04-07parent: #6be1bb5.patch.diff
in: master

4 files changed

modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -33,7 +33,7 @@
 	COLLECTION_ADMINS_LIMIT, MetaUpdatePermission, TokenId, CollectionStats, MAX_TOKEN_OWNERSHIP,
 	CollectionMode, NFT_SPONSOR_TRANSFER_TIMEOUT, FUNGIBLE_SPONSOR_TRANSFER_TIMEOUT,
 	REFUNGIBLE_SPONSOR_TRANSFER_TIMEOUT, MAX_SPONSOR_TIMEOUT, CUSTOM_DATA_LIMIT, CollectionLimits,
-	CustomDataLimit, CreateCollectionData, SponsorshipState, CreateItemExData, SponsoringRateLimit, budget::Budget, COLLECTION_FIELD_LIMIT, CollectionField,
+	CustomDataLimit, CreateCollectionData, SponsorshipState, CreateItemExData, SponsoringRateLimit, budget::Budget, COLLECTION_FIELD_LIMIT, CollectionField, PhantomType,
 };
 pub use pallet::*;
 use sp_core::H160;
@@ -415,8 +415,8 @@
 
 	/// Not used by code, exists only to provide some types to metadata
 	#[pallet::storage]
-	pub type DummyStorageValue<T> =
-		StorageValue<Value = (CollectionStats, CollectionId, TokenId), QueryKind = OptionQuery>;
+	pub type DummyStorageValue<T: Config> =
+		StorageValue<Value = (CollectionStats, CollectionId, TokenId, PhantomType<RpcCollection<T::AccountId>>), QueryKind = OptionQuery>;
 
 	#[pallet::hooks]
 	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {
modifiedprimitives/data-structs/src/lib.rsdiffbeforeafterboth
--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -583,3 +583,24 @@
 	pub destroyed: u32,
 	pub alive: u32,
 }
+
+#[derive(Encode, Decode, PartialEq, Clone, Debug)]
+pub struct PhantomType<T>(core::marker::PhantomData<T>);
+
+impl<T: TypeInfo + 'static> TypeInfo for PhantomType<T> {
+	type Identity = PhantomType<T>;
+
+	fn type_info() -> scale_info::Type {
+		use scale_info::{Type, Path, build::{FieldsBuilder, UnnamedFields}};
+		Type::builder()
+			.path(Path::new("up_data_structs", "PhantomType"))
+			.composite(<FieldsBuilder<UnnamedFields>>::default().field(|b|
+				b.ty::<[T ;0]>()
+			))
+	}
+}
+impl<T> MaxEncodedLen for PhantomType<T> {
+	fn max_encoded_len() -> usize {
+		0
+	}
+}
\ No newline at end of file
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
67 },67 },
68};68};
69use up_data_structs::mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping};69use up_data_structs::mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping};
70use up_data_structs::{CollectionId, TokenId, CollectionStats, Collection, RpcCollection};70use up_data_structs::{CollectionId, TokenId, CollectionStats, RpcCollection};
71// use pallet_contracts::weights::WeightInfo;71// use pallet_contracts::weights::WeightInfo;
72// #[cfg(any(feature = "std", test))]72// #[cfg(any(feature = "std", test))]
73use frame_system::{73use frame_system::{
modifiedtests/src/interfaces/unique/definitions.tsdiffbeforeafterboth
--- a/tests/src/interfaces/unique/definitions.ts
+++ b/tests/src/interfaces/unique/definitions.ts
@@ -52,7 +52,7 @@
     constMetadata: fun('Get token constant metadata', [collectionParam, tokenParam], 'Vec<u8>'),
     variableMetadata: fun('Get token variable metadata', [collectionParam, tokenParam], 'Vec<u8>'),
     tokenExists: fun('Check if token exists', [collectionParam, tokenParam], 'bool'),
-    collectionById: fun('Get collection by specified id', [collectionParam], 'Option<UpDataStructsCollection>'),
+    collectionById: fun('Get collection by specified id', [collectionParam], 'Option<UpDataStructsRpcCollection>'),
     collectionStats: fun('Get collection stats', [], 'UpDataStructsCollectionStats'),
     allowed: fun('Check if user is allowed to use collection', [collectionParam, crossAccountParam()], 'bool'),
     nextSponsored: fun('Get number of blocks when sponsored transaction is available', [collectionParam, crossAccountParam(), tokenParam], 'Option<u64>'),