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

difftreelog

test fix build

Yaroslav Bolyukin2023-10-17parent: #d0d6ce4.patch.diff
in: master

5 files changed

modifiednode/cli/Cargo.tomldiffbeforeafterboth
--- a/node/cli/Cargo.toml
+++ b/node/cli/Cargo.toml
@@ -114,9 +114,7 @@
 	'quartz-runtime?/gov-test-timings',
 	'unique-runtime?/gov-test-timings',
 ]
-lookahead = [
-	'opal-runtime/lookahead'
-]
+lookahead = ['opal-runtime/lookahead']
 pov-estimate = [
 	'opal-runtime/pov-estimate',
 	'quartz-runtime?/pov-estimate',
modifiedpallets/inflation/src/tests.rsdiffbeforeafterboth
--- a/pallets/inflation/src/tests.rs
+++ b/pallets/inflation/src/tests.rs
@@ -122,7 +122,7 @@
 	type Currency = Balances;
 	type TreasuryAccountId = TreasuryAccountId;
 	type InflationBlockInterval = InflationBlockInterval;
-	type BlockNumberProvider = MockBlockNumberProvider;
+	type OnInitializeBlockNumberProvider = MockBlockNumberProvider;
 }
 
 pub fn new_test_ext() -> sp_io::TestExternalities {
modifiedpallets/unique/Cargo.tomldiffbeforeafterboth
--- a/pallets/unique/Cargo.toml
+++ b/pallets/unique/Cargo.toml
@@ -28,12 +28,12 @@
 	'pallet-evm-coder-substrate/std',
 	'pallet-evm/std',
 	'pallet-nonfungible/std',
+	'pallet-structure/std',
 	'parity-scale-codec/std',
 	'sp-runtime/std',
 	'sp-std/std',
 	'up-common/std',
 	'up-data-structs/std',
-	'pallet-structure/std',
 ]
 stubgen = ["evm-coder/stubgen", "pallet-common/stubgen"]
 try-runtime = ["frame-support/try-runtime"]
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
after · runtime/opal/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Opal Runtime'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'opal-runtime'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version.workspace = true1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['opal-runtime', 'std']20limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']21opal-runtime = [22	'app-promotion',23	'collator-selection',24	'foreign-assets',25	'governance',26	'pallet-test-utils',27	'preimage',28	'refungible',29]30pov-estimate = []31runtime-benchmarks = [32	"pallet-preimage/runtime-benchmarks",33	'cumulus-pallet-parachain-system/runtime-benchmarks',34	'frame-benchmarking',35	'frame-support/runtime-benchmarks',36	'frame-system-benchmarking',37	'frame-system/runtime-benchmarks',38	'pallet-app-promotion/runtime-benchmarks',39	'pallet-balances/runtime-benchmarks',40	'pallet-collator-selection/runtime-benchmarks',41	'pallet-collective/runtime-benchmarks',42	'pallet-common/runtime-benchmarks',43	'pallet-configuration/runtime-benchmarks',44	'pallet-democracy/runtime-benchmarks',45	'pallet-ethereum/runtime-benchmarks',46	'pallet-evm-coder-substrate/runtime-benchmarks',47	'pallet-evm-migration/runtime-benchmarks',48	'pallet-foreign-assets/runtime-benchmarks',49	'pallet-fungible/runtime-benchmarks',50	'pallet-identity/runtime-benchmarks',51	'pallet-inflation/runtime-benchmarks',52	'pallet-maintenance/runtime-benchmarks',53	'pallet-membership/runtime-benchmarks',54	'pallet-nonfungible/runtime-benchmarks',55	'pallet-ranked-collective/runtime-benchmarks',56	'pallet-referenda/runtime-benchmarks',57	'pallet-refungible/runtime-benchmarks',58	'pallet-scheduler/runtime-benchmarks',59	'pallet-structure/runtime-benchmarks',60	'pallet-timestamp/runtime-benchmarks',61	'pallet-unique/runtime-benchmarks',62	'pallet-utility/runtime-benchmarks',63	'pallet-xcm/runtime-benchmarks',64	'sp-runtime/runtime-benchmarks',65	'staging-xcm-builder/runtime-benchmarks',66]67std = [68	'cumulus-pallet-aura-ext/std',69	'cumulus-pallet-parachain-system/std',70	'cumulus-pallet-xcm/std',71	'cumulus-pallet-xcmp-queue/std',72	'cumulus-primitives-aura/std',73	'cumulus-primitives-core/std',74	'cumulus-primitives-utility/std',75	'frame-executive/std',76	'frame-support/std',77	'frame-system-rpc-runtime-api/std',78	'frame-system/std',79	'frame-try-runtime/std',80	'pallet-aura/std',81	'pallet-balances/std',82	'pallet-collective/std',83	'pallet-democracy/std',84	'pallet-gov-origins/std',85	'pallet-membership/std',86	'pallet-ranked-collective/std',87	'pallet-referenda/std',88	'pallet-scheduler/std',89	'parity-scale-codec/std',90	# 'pallet-contracts/std',91	# 'pallet-contracts-primitives/std',92	# 'pallet-contracts-rpc-runtime-api/std',93	# 'pallet-contract-helpers/std',94	"pallet-authorship/std",95	"pallet-preimage/std",96	"pallet-session/std",97	"pallet-state-trie-migration/std",98	"sp-consensus-aura/std",99	'app-promotion-rpc/std',100	'evm-coder/std',101	'fp-rpc/std',102	'fp-self-contained/std',103	'pallet-app-promotion/std',104	'pallet-balances-adapter/std',105	'pallet-base-fee/std',106	'pallet-charge-transaction/std',107	'pallet-collator-selection/std',108	'pallet-common/std',109	'pallet-configuration/std',110	'pallet-ethereum/std',111	'pallet-evm-coder-substrate/std',112	'pallet-evm-contract-helpers/std',113	'pallet-evm-migration/std',114	'pallet-evm-transaction-payment/std',115	'pallet-evm/std',116	'pallet-fungible/std',117	'pallet-identity/std',118	'pallet-inflation/std',119	'pallet-nonfungible/std',120	'pallet-refungible/std',121	'pallet-structure/std',122	'pallet-sudo/std',123	'pallet-timestamp/std',124	'pallet-transaction-payment-rpc-runtime-api/std',125	'pallet-transaction-payment/std',126	'pallet-treasury/std',127	'pallet-unique/std',128	'pallet-utility/std',129	'parachain-info/std',130	'serde',131	'sp-api/std',132	'sp-block-builder/std',133	'sp-core/std',134	'sp-inherents/std',135	'sp-io/std',136	'sp-offchain/std',137	'sp-runtime/std',138	'sp-session/std',139	'sp-std/std',140	'sp-storage/std',141	'sp-transaction-pool/std',142	'sp-version/std',143	'staging-xcm-builder/std',144	'staging-xcm-executor/std',145	'staging-xcm/std',146	'up-common/std',147	'up-data-structs/std',148	'up-pov-estimate-rpc/std',149	'up-rpc/std',150	'up-sponsorship/std',151152	"orml-tokens/std",153	"orml-traits/std",154	"orml-vesting/std",155	"orml-xcm-support/std",156	"orml-xtokens/std",157	"pallet-foreign-assets/std",158159	'pallet-maintenance/std',160	'pallet-test-utils?/std',161]162try-runtime = [163	"pallet-authorship/try-runtime",164	"pallet-collator-selection/try-runtime",165	"pallet-identity/try-runtime",166	"pallet-preimage/try-runtime",167	"pallet-session/try-runtime",168	"pallet-state-trie-migration/try-runtime",169	'cumulus-pallet-aura-ext/try-runtime',170	'cumulus-pallet-dmp-queue/try-runtime',171	'cumulus-pallet-parachain-system/try-runtime',172	'cumulus-pallet-xcm/try-runtime',173	'cumulus-pallet-xcmp-queue/try-runtime',174	'fp-self-contained/try-runtime',175	'frame-executive/try-runtime',176	'frame-support/try-runtime',177	'frame-system/try-runtime',178	'frame-try-runtime',179	'frame-try-runtime?/try-runtime',180	'orml-tokens/try-runtime',181	'orml-vesting/try-runtime',182	'orml-xtokens/try-runtime',183	'pallet-app-promotion/try-runtime',184	'pallet-aura/try-runtime',185	'pallet-balances-adapter/try-runtime',186	'pallet-balances/try-runtime',187	'pallet-base-fee/try-runtime',188	'pallet-charge-transaction/try-runtime',189	'pallet-collective/try-runtime',190	'pallet-collective/try-runtime',191	'pallet-common/try-runtime',192	'pallet-configuration/try-runtime',193	'pallet-democracy/try-runtime',194	'pallet-democracy/try-runtime',195	'pallet-ethereum/try-runtime',196	'pallet-evm-coder-substrate/try-runtime',197	'pallet-evm-contract-helpers/try-runtime',198	'pallet-evm-migration/try-runtime',199	'pallet-evm-transaction-payment/try-runtime',200	'pallet-evm/try-runtime',201	'pallet-foreign-assets/try-runtime',202	'pallet-fungible/try-runtime',203	'pallet-gov-origins/try-runtime',204	'pallet-inflation/try-runtime',205	'pallet-maintenance/try-runtime',206	'pallet-membership/try-runtime',207	'pallet-membership/try-runtime',208	'pallet-nonfungible/try-runtime',209	'pallet-ranked-collective/try-runtime',210	'pallet-referenda/try-runtime',211	'pallet-refungible/try-runtime',212	'pallet-scheduler/try-runtime',213	'pallet-scheduler/try-runtime',214	'pallet-structure/try-runtime',215	'pallet-sudo/try-runtime',216	'pallet-test-utils?/try-runtime',217	'pallet-timestamp/try-runtime',218	'pallet-transaction-payment/try-runtime',219	'pallet-treasury/try-runtime',220	'pallet-unique/try-runtime',221	'pallet-utility/try-runtime',222	'pallet-xcm/try-runtime',223	'parachain-info/try-runtime',224]225226app-promotion = []227collator-selection = []228foreign-assets = []229gov-test-timings = []230governance = []231lookahead = []232preimage = []233refungible = []234session-test-timings = []235236################################################################################237# local dependencies238239[dependencies]240cumulus-pallet-aura-ext = { workspace = true }241cumulus-pallet-dmp-queue = { workspace = true }242cumulus-pallet-parachain-system = { workspace = true }243cumulus-pallet-xcm = { workspace = true }244cumulus-pallet-xcmp-queue = { workspace = true }245cumulus-primitives-aura = { workspace = true }246cumulus-primitives-core = { workspace = true }247cumulus-primitives-timestamp = { workspace = true }248cumulus-primitives-utility = { workspace = true }249frame-executive = { workspace = true }250frame-support = { workspace = true }251frame-system = { workspace = true }252frame-system-rpc-runtime-api = { workspace = true }253orml-tokens = { workspace = true }254orml-traits = { workspace = true }255orml-vesting = { workspace = true }256orml-xcm-support = { workspace = true }257orml-xtokens = { workspace = true }258pallet-aura = { workspace = true }259pallet-authorship = { workspace = true }260pallet-balances = { features = ["insecure_zero_ed"], workspace = true }261pallet-preimage = { workspace = true }262pallet-session = { workspace = true }263pallet-state-trie-migration = { workspace = true }264pallet-sudo = { workspace = true }265pallet-timestamp = { workspace = true }266pallet-transaction-payment = { workspace = true }267pallet-transaction-payment-rpc-runtime-api = { workspace = true }268pallet-treasury = { workspace = true }269pallet-utility = { workspace = true }270pallet-xcm = { workspace = true }271parachain-info = { workspace = true }272parity-scale-codec = { workspace = true }273polkadot-parachain-primitives = { workspace = true }274smallvec = { workspace = true }275sp-api = { workspace = true }276sp-arithmetic = { workspace = true }277sp-block-builder = { workspace = true }278sp-consensus-aura = { workspace = true }279sp-core = { workspace = true }280sp-inherents = { workspace = true }281sp-io = { workspace = true }282sp-offchain = { workspace = true }283sp-runtime = { workspace = true }284sp-session = { workspace = true }285sp-std = { workspace = true }286sp-storage = { workspace = true }287sp-transaction-pool = { workspace = true }288sp-version = { workspace = true }289staging-xcm = { workspace = true }290staging-xcm-builder = { workspace = true }291staging-xcm-executor = { workspace = true }292293app-promotion-rpc = { workspace = true }294derivative = { workspace = true }295evm-coder = { workspace = true }296fp-evm = { workspace = true }297fp-rpc = { workspace = true }298fp-self-contained = { workspace = true }299log = { workspace = true }300num_enum = { workspace = true }301pallet-app-promotion = { workspace = true }302pallet-balances-adapter = { workspace = true }303pallet-base-fee = { workspace = true }304pallet-charge-transaction = { workspace = true }305pallet-collator-selection = { workspace = true }306pallet-collective = { workspace = true }307pallet-common = { workspace = true }308pallet-configuration = { workspace = true }309pallet-democracy = { workspace = true }310pallet-ethereum = { workspace = true }311pallet-evm = { workspace = true }312pallet-evm-coder-substrate = { workspace = true }313pallet-evm-contract-helpers = { workspace = true }314pallet-evm-migration = { workspace = true }315pallet-evm-precompile-simple = { workspace = true }316pallet-evm-transaction-payment = { workspace = true }317pallet-foreign-assets = { workspace = true }318pallet-fungible = { workspace = true }319pallet-gov-origins = { workspace = true }320pallet-identity = { workspace = true }321pallet-inflation = { workspace = true }322pallet-maintenance = { workspace = true }323pallet-membership = { workspace = true }324pallet-nonfungible = { workspace = true }325pallet-ranked-collective = { workspace = true }326pallet-referenda = { workspace = true }327pallet-refungible = { workspace = true }328pallet-scheduler = { workspace = true }329pallet-structure = { workspace = true }330pallet-unique = { workspace = true }331precompile-utils-macro = { workspace = true }332scale-info = { workspace = true }333up-common = { workspace = true }334up-data-structs = { workspace = true }335up-pov-estimate-rpc = { workspace = true }336up-rpc = { workspace = true }337up-sponsorship = { workspace = true }338339################################################################################340# Optional dependencies341342frame-benchmarking = { workspace = true, optional = true }343frame-system-benchmarking = { workspace = true, optional = true }344frame-try-runtime = { workspace = true, optional = true }345serde = { workspace = true, optional = true }346347################################################################################348# Test dependencies349350pallet-test-utils = { workspace = true, optional = true }351352################################################################################353# Other Dependencies354355hex-literal = { workspace = true }356impl-trait-for-tuples = { workspace = true }357358[build-dependencies]359substrate-wasm-builder = { workspace = true }
modifiedruntime/tests/src/tests.rsdiffbeforeafterboth
--- a/runtime/tests/src/tests.rs
+++ b/runtime/tests/src/tests.rs
@@ -1161,7 +1161,7 @@
 		// Try to burn item using Token ID
 		assert_noop!(
 			Unique::burn_item(origin1, CollectionId(1), TokenId(1), 5).map_err(|e| e.error),
-			<pallet_fungible::Error::<Test>>::FungibleItemsHaveNoId
+			<CommonError::<Test>>::FungibleItemsHaveNoId
 		);
 	});
 }