git.delta.rocks / unique-network / refs/commits / 0e9500cc7cf2

difftreelog

fix simplify test timings features

Daniel Shiposha2023-09-08parent: #cb2cc11.patch.diff
in: master

3 files changed

modified.docker/docker-compose.gov.j2diffbeforeafterboth
--- a/.docker/docker-compose.gov.j2
+++ b/.docker/docker-compose.gov.j2
@@ -21,4 +21,4 @@
       options:
         max-size: "1m"
         max-file: "3"
-    command: cargo run --release --features={{ NETWORK }}-runtime,{{ WASM_NAME }}-runtime/gov-test-timings -- --dev -linfo --rpc-cors=all --unsafe-rpc-external
+    command: cargo run --release --features={{ NETWORK }}-runtime,gov-test-timings -- --dev -linfo --rpc-cors=all --unsafe-rpc-external
modified.github/workflows/collator-selection.ymldiffbeforeafterboth
--- a/.github/workflows/collator-selection.yml
+++ b/.github/workflows/collator-selection.yml
@@ -40,9 +40,9 @@
         id: create_matrix
         with:
           matrix: |
-            network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}, wasm_name {opal}
-            network {quartz}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}, wasm_name {quartz}
-            network {sapphire}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}}, wasm_name {quartz}
+            network {opal}, relay_branch {${{ env.UNIQUEWEST_MAINNET_BRANCH }}}
+            network {quartz}, relay_branch {${{ env.KUSAMA_MAINNET_BRANCH }}}
+            network {sapphire}, relay_branch {${{ env.UNIQUEEAST_MAINNET_BRANCH }}}
 
   collator-selection:
 
@@ -139,7 +139,7 @@
           context: .
           dockerfile: .docker/Dockerfile-unique
           args: |
-            --build-arg RUNTIME_FEATURES=${{ matrix.runtime_features }},${{ matrix.wasm_name }}-runtime/session-test-timing
+            --build-arg RUNTIME_FEATURES=${{ matrix.runtime_features }},session-test-timing
             --build-arg RUST_TOOLCHAIN=${{ env.RUST_TOOLCHAIN }}
           dockerhub_username: ${{ secrets.CORE_DOCKERHUB_USERNAME }}
           dockerhub_token: ${{ secrets.CORE_DOCKERHUB_TOKEN }}
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.1"24futures = '0.3.28'25tokio = { version = "1.24", features = ["time"] }26serde_json = "1.0"2728log = { workspace = true }2930# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it.31codec = { workspace = true, package = "parity-scale-codec" }3233cumulus-client-cli = { workspace = true }34cumulus-client-consensus-aura = { workspace = true }35cumulus-client-consensus-common = { workspace = true }36cumulus-client-network = { workspace = true }37cumulus-client-service = { workspace = true }38cumulus-primitives-core = { workspace = true }39cumulus-primitives-parachain-inherent = { workspace = true }40cumulus-relay-chain-inprocess-interface = { workspace = true }41cumulus-relay-chain-interface = { workspace = true }42cumulus-relay-chain-minimal-node = { workspace = true }43frame-benchmarking = { workspace = true }44frame-benchmarking-cli = { workspace = true }45opal-runtime = { workspace = true, optional = true }46pallet-transaction-payment-rpc-runtime-api = { workspace = true }47polkadot-cli = { workspace = true }48polkadot-primitives = { workspace = true }49polkadot-service = { workspace = true }50quartz-runtime = { workspace = true, optional = true }51sc-basic-authorship = { workspace = true }52sc-chain-spec = { workspace = true }53sc-cli = { workspace = true }54sc-client-api = { workspace = true }55sc-consensus = { workspace = true }56sc-consensus-manual-seal = { workspace = true }57sc-executor = { workspace = true }58sc-network = { workspace = true }59sc-network-sync = { workspace = true }60sc-service = { workspace = true }61sc-sysinfo = { workspace = true }62sc-telemetry = { workspace = true }63sc-tracing = { workspace = true }64sc-transaction-pool = { workspace = true }65serde = { workspace = true }66sp-api = { workspace = true }67sp-block-builder = { workspace = true }68sp-blockchain = { workspace = true }69sp-consensus-aura = { workspace = true }70sp-core = { workspace = true }71sp-io = { workspace = true }72sp-keystore = { workspace = true }73sp-offchain = { workspace = true }74sp-runtime = { workspace = true }75sp-session = { workspace = true }76sp-timestamp = { workspace = true }77sp-transaction-pool = { workspace = true }78substrate-frame-rpc-system = { workspace = true }79substrate-prometheus-endpoint = { workspace = true }80try-runtime-cli = { workspace = true }81unique-runtime = { workspace = true, optional = true }82up-common = { workspace = true }83up-data-structs = { workspace = true }8485fc-consensus = { workspace = true }86fc-db = { workspace = true }87fc-mapping-sync = { workspace = true }88fc-rpc = { workspace = true }89fc-rpc-core = { workspace = true }90fp-rpc = { workspace = true }9192app-promotion-rpc = { workspace = true }93uc-rpc = { workspace = true }94unique-rpc = { workspace = true }95up-pov-estimate-rpc = { workspace = true }96up-rpc = { workspace = true }97jsonrpsee.workspace = true98fp-storage.workspace = true99sc-rpc.workspace = true100101[build-dependencies]102substrate-build-script-utils = { workspace = true }103104[features]105default = ["opal-runtime"]106all-runtimes = ['opal-runtime', 'quartz-runtime', 'unique-runtime']107pov-estimate = ['opal-runtime/pov-estimate', 'quartz-runtime?/pov-estimate', 'uc-rpc/pov-estimate', 'unique-rpc/pov-estimate', 'unique-runtime?/pov-estimate']108runtime-benchmarks = ['opal-runtime/runtime-benchmarks', 'polkadot-cli/runtime-benchmarks', 'polkadot-service/runtime-benchmarks', 'quartz-runtime?/runtime-benchmarks', 'sc-service/runtime-benchmarks', 'unique-runtime?/runtime-benchmarks']109sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire']110try-runtime = ['opal-runtime?/try-runtime', 'quartz-runtime?/try-runtime', 'try-runtime-cli/try-runtime', 'unique-runtime?/try-runtime']
after · 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.1"24futures = '0.3.28'25tokio = { version = "1.24", features = ["time"] }26serde_json = "1.0"2728log = { workspace = true }2930# Note: `package = "parity-scale-codec"` must be supplied since the `Encode` macro searches for it.31codec = { workspace = true, package = "parity-scale-codec" }3233cumulus-client-cli = { workspace = true }34cumulus-client-consensus-aura = { workspace = true }35cumulus-client-consensus-common = { workspace = true }36cumulus-client-network = { workspace = true }37cumulus-client-service = { workspace = true }38cumulus-primitives-core = { workspace = true }39cumulus-primitives-parachain-inherent = { workspace = true }40cumulus-relay-chain-inprocess-interface = { workspace = true }41cumulus-relay-chain-interface = { workspace = true }42cumulus-relay-chain-minimal-node = { workspace = true }43frame-benchmarking = { workspace = true }44frame-benchmarking-cli = { workspace = true }45opal-runtime = { workspace = true, optional = true }46pallet-transaction-payment-rpc-runtime-api = { workspace = true }47polkadot-cli = { workspace = true }48polkadot-primitives = { workspace = true }49polkadot-service = { workspace = true }50quartz-runtime = { workspace = true, optional = true }51sc-basic-authorship = { workspace = true }52sc-chain-spec = { workspace = true }53sc-cli = { workspace = true }54sc-client-api = { workspace = true }55sc-consensus = { workspace = true }56sc-consensus-manual-seal = { workspace = true }57sc-executor = { workspace = true }58sc-network = { workspace = true }59sc-network-sync = { workspace = true }60sc-service = { workspace = true }61sc-sysinfo = { workspace = true }62sc-telemetry = { workspace = true }63sc-tracing = { workspace = true }64sc-transaction-pool = { workspace = true }65serde = { workspace = true }66sp-api = { workspace = true }67sp-block-builder = { workspace = true }68sp-blockchain = { workspace = true }69sp-consensus-aura = { workspace = true }70sp-core = { workspace = true }71sp-io = { workspace = true }72sp-keystore = { workspace = true }73sp-offchain = { workspace = true }74sp-runtime = { workspace = true }75sp-session = { workspace = true }76sp-timestamp = { workspace = true }77sp-transaction-pool = { workspace = true }78substrate-frame-rpc-system = { workspace = true }79substrate-prometheus-endpoint = { workspace = true }80try-runtime-cli = { workspace = true }81unique-runtime = { workspace = true, optional = true }82up-common = { workspace = true }83up-data-structs = { workspace = true }8485fc-consensus = { workspace = true }86fc-db = { workspace = true }87fc-mapping-sync = { workspace = true }88fc-rpc = { workspace = true }89fc-rpc-core = { workspace = true }90fp-rpc = { workspace = true }9192app-promotion-rpc = { workspace = true }93uc-rpc = { workspace = true }94unique-rpc = { workspace = true }95up-pov-estimate-rpc = { workspace = true }96up-rpc = { workspace = true }97jsonrpsee.workspace = true98fp-storage.workspace = true99sc-rpc.workspace = true100101[build-dependencies]102substrate-build-script-utils = { workspace = true }103104[features]105default = ["opal-runtime"]106session-test-timing = ['opal-runtime/session-test-timing', 'quartz-runtime?/session-test-timing', 'unique-runtime?/session-test-timing']107gov-test-timings = ['opal-runtime/gov-test-timings', 'quartz-runtime?/gov-test-timings', 'unique-runtime?/gov-test-timings']108all-runtimes = ['opal-runtime', 'quartz-runtime', 'unique-runtime']109pov-estimate = ['opal-runtime/pov-estimate', 'quartz-runtime?/pov-estimate', 'uc-rpc/pov-estimate', 'unique-rpc/pov-estimate', 'unique-runtime?/pov-estimate']110runtime-benchmarks = ['opal-runtime/runtime-benchmarks', 'polkadot-cli/runtime-benchmarks', 'polkadot-service/runtime-benchmarks', 'quartz-runtime?/runtime-benchmarks', 'sc-service/runtime-benchmarks', 'unique-runtime?/runtime-benchmarks']111sapphire-runtime = ['quartz-runtime', 'quartz-runtime/become-sapphire']112try-runtime = ['opal-runtime?/try-runtime', 'quartz-runtime?/try-runtime', 'try-runtime-cli/try-runtime', 'unique-runtime?/try-runtime']