difftreelog
fix post-merge fixup
in: master
4 files changed
client/rpc/src/lib.rsdiffbeforeafterboth76 token: TokenId,76 token: TokenId,77 at: Option<BlockHash>,77 at: Option<BlockHash>,78 ) -> Result<Option<CrossAccountId>>;78 ) -> Result<Option<CrossAccountId>>;79 #[rpc(name = "unique_tokenChildren")]79 #[method(name = "unique_tokenChildren")]80 fn token_children(80 fn token_children(81 &self,81 &self,82 collection: CollectionId,82 collection: CollectionId,runtime/opal/src/lib.rsdiffbeforeafterboth74 CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits,74 CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits,75 CollectionStats, RpcCollection,75 CollectionStats, RpcCollection,76 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},76 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},77 TokenChild,77};78};787979// use pallet_contracts::weights::WeightInfo;80// use pallet_contracts::weights::WeightInfo;runtime/quartz/src/lib.rsdiffbeforeafterboth100use up_data_structs::{100use up_data_structs::{101 CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits, 101 CollectionId, TokenId, TokenData, Property, PropertyKeyPermission, CollectionLimits, 102 CollectionStats, RpcCollection, 102 CollectionStats, RpcCollection, 103 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping}103 mapping::{EvmTokenAddressMapping, CrossTokenAddressMapping},104 TokenChild,104};105};105use xcm::v1::{BodyId, Junction::*, MultiLocation, NetworkId, Junctions::*};106use xcm::v1::{BodyId, Junction::*, MultiLocation, NetworkId, Junctions::*};106use xcm_builder::{107use xcm_builder::{runtime/tests/src/tests.rsdiffbeforeafterboth21 CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT, TokenId,21 CreateReFungibleData, MAX_DECIMAL_POINTS, COLLECTION_ADMINS_LIMIT, TokenId,22 MAX_TOKEN_OWNERSHIP, CreateCollectionData, CollectionMode, AccessMode, CollectionPermissions,22 MAX_TOKEN_OWNERSHIP, CreateCollectionData, CollectionMode, AccessMode, CollectionPermissions,23 PropertyKeyPermission, PropertyPermission, Property, CollectionPropertiesVec,23 PropertyKeyPermission, PropertyPermission, Property, CollectionPropertiesVec,24 CollectionPropertiesPermissionsVec,24 CollectionPropertiesPermissionsVec, TokenChild,25};25};26use frame_support::{assert_noop, assert_ok, assert_err};26use frame_support::{assert_noop, assert_ok, assert_err};27use sp_std::convert::TryInto;27use sp_std::convert::TryInto;