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
before · node/cli/Cargo.toml
1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Unique Node'8edition = '2021'9homepage = 'https://unique.network'10license = 'GPLv3'11name = 'unique-node'12repository = 'https://github.com/UniqueNetwork/unique-chain'13version.workspace = true1415[[bin]]16name = 'unique-collator'17path = "src/main.rs"1819[package.metadata.docs.rs]20targets = ['x86_64-unknown-linux-gnu']2122[dependencies]23clap = "4.4"24futures = '0.3.28'25serde_json = "1.0"26tokio = { version = "1.32", features = ["time"] }2728log = { workspace = true }2930parity-scale-codec = { workspace = true }3132cumulus-client-cli = { workspace = true }33cumulus-client-collator = { workspace = true }34cumulus-client-consensus-aura = { workspace = true }35cumulus-client-consensus-common = { workspace = true }36cumulus-client-consensus-proposer = { workspace = true }37cumulus-client-network = { workspace = true }38cumulus-client-service = { workspace = true }39cumulus-primitives-aura = { workspace = true }40cumulus-primitives-core = { workspace = true }41cumulus-primitives-parachain-inherent = { features = ["std"], workspace = true }42cumulus-relay-chain-inprocess-interface = { workspace = true }43cumulus-relay-chain-interface = { workspace = true }44cumulus-relay-chain-minimal-node = { workspace = true }45frame-benchmarking = { workspace = true }46frame-benchmarking-cli = { workspace = true }47opal-runtime = { workspace = true, optional = true }48pallet-transaction-payment-rpc-runtime-api = { workspace = true }49polkadot-cli = { workspace = true }50polkadot-primitives = { workspace = true }51polkadot-service = { workspace = true }52quartz-runtime = { workspace = true, optional = true }53sc-basic-authorship = { workspace = true }54sc-chain-spec = { workspace = true }55sc-cli = { workspace = true }56sc-client-api = { workspace = true }57sc-consensus = { workspace = true }58sc-consensus-manual-seal = { workspace = true }59sc-executor = { workspace = true }60sc-network = { workspace = true }61sc-network-sync = { workspace = true }62sc-service = { workspace = true }63sc-sysinfo = { workspace = true }64sc-telemetry = { workspace = true }65sc-tracing = { workspace = true }66sc-transaction-pool = { workspace = true }67serde = { workspace = true }68sp-api = { workspace = true }69sp-block-builder = { workspace = true }70sp-blockchain = { workspace = true }71sp-consensus-aura = { workspace = true }72sp-core = { workspace = true }73sp-io = { workspace = true }74sp-keystore = { workspace = true }75sp-offchain = { workspace = true }76sp-runtime = { workspace = true }77sp-session = { workspace = true }78sp-timestamp = { workspace = true }79sp-transaction-pool = { workspace = true }80substrate-frame-rpc-system = { workspace = true }81substrate-prometheus-endpoint = { workspace = true }82try-runtime-cli = { workspace = true }83unique-runtime = { workspace = true, optional = true }84up-common = { workspace = true }85up-data-structs = { workspace = true }8687fc-consensus = { workspace = true }88fc-db = { workspace = true }89fc-mapping-sync = { workspace = true }90fc-rpc-core = { workspace = true }91fc-rpc.workspace = true92fp-rpc = { workspace = true }9394app-promotion-rpc = { workspace = true }95fc-api.workspace = true96fp-storage.workspace = true97jsonrpsee.workspace = true98pallet-transaction-payment-rpc.workspace = true99sc-rpc-api.workspace = true100sc-rpc.workspace = true101sp-inherents.workspace = true102uc-rpc = { workspace = true }103up-pov-estimate-rpc = { workspace = true }104up-rpc = { workspace = true }105106[build-dependencies]107substrate-build-script-utils = { workspace = true }108109[features]110all-runtimes = ['opal-runtime', 'quartz-runtime', 'unique-runtime']111default = ["opal-runtime"]112gov-test-timings = [113	'opal-runtime/gov-test-timings',114	'quartz-runtime?/gov-test-timings',115	'unique-runtime?/gov-test-timings',116]117lookahead = [118	'opal-runtime/lookahead'119]120pov-estimate = [121	'opal-runtime/pov-estimate',122	'quartz-runtime?/pov-estimate',123	'uc-rpc/pov-estimate',124	'unique-runtime?/pov-estimate',125]126runtime-benchmarks = [127	'opal-runtime/runtime-benchmarks',128	'polkadot-cli/runtime-benchmarks',129	'polkadot-service/runtime-benchmarks',130	'quartz-runtime?/runtime-benchmarks',131	'sc-service/runtime-benchmarks',132	'unique-runtime?/runtime-benchmarks',133]134sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire']135session-test-timings = [136	'opal-runtime/session-test-timings',137	'quartz-runtime?/session-test-timings',138	'unique-runtime?/session-test-timings',139]140try-runtime = [141	'opal-runtime?/try-runtime',142	'quartz-runtime?/try-runtime',143	'try-runtime-cli/try-runtime',144	'unique-runtime?/try-runtime',145]
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
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -137,7 +137,7 @@
 	'sp-runtime/std',
 	'sp-session/std',
 	'sp-std/std',
-    'sp-storage/std',
+	'sp-storage/std',
 	'sp-transaction-pool/std',
 	'sp-version/std',
 	'staging-xcm-builder/std',
@@ -228,10 +228,10 @@
 foreign-assets = []
 gov-test-timings = []
 governance = []
+lookahead = []
 preimage = []
 refungible = []
 session-test-timings = []
-lookahead = []
 
 ################################################################################
 # local dependencies
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
 		);
 	});
 }