Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Companion for new Trie cache #5897

Merged
merged 11 commits into from
Aug 18, 2022
Merged

Companion for new Trie cache #5897

merged 11 commits into from
Aug 18, 2022

Conversation

bkchr
Copy link
Member

@bkchr bkchr commented Aug 18, 2022 •
edited
Loading

@bkchr bkchr added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit. labels Aug 18, 2022
@bkchr bkchr requested review from cheme and arkpar August 18, 2022 09:45
@paritytech-cicd-pr
Copy link

The CI pipeline was cancelled due to failure one of the required jobs.
The job name - test-linux-stable
The job logs - https://gitlab.parity.io/parity/mirrors/polkadot/-/jobs/1754792

@bkchr bkchr mentioned this pull request Aug 18, 2022
Merged
cheme
cheme reviewed Aug 18, 2022
View reviewed changes
runtime/rococo/src/lib.rs
@@ -717,20 +717,6 @@ impl pallet_beefy_mmr::Config for Runtime {
type BeefyDataProvider = ParasProvider;
}

parameter_types! {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it meant to be part of companion?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sort of yes. They are not being used anymore. I removed them while fixing some merge conflicts. I can bring them back, however creating an extra pr for this isn't it really worth :P

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No it's fine as long as it is not a mistake.

@paritytech-processbot
Copy link

Merge cancelled due to error. Error: Command 'Command { std: "cargo" "update" "-v" "-p" "frame-system-benchmarking:4.0.0-dev" "-p" "substrate-wasm-builder:5.0.0-dev" "-p" "pallet-indices:4.0.0-dev" "-p" "beefy-gadget-rpc:4.0.0-dev" "-p" "pallet-session:4.0.0-dev" "-p" "sp-arithmetic:5.0.0" "-p" "sc-peerset:4.0.0-dev" "-p" "sc-proposer-metrics:0.10.0-dev" "-p" "sp-core:6.0.0" "-p" "sp-offchain:4.0.0-dev" "-p" "sp-keystore:0.12.0" "-p" "pallet-bags-list-remote-tests:4.0.0-dev" "-p" "sc-sysinfo:6.0.0-dev" "-p" "pallet-staking:4.0.0-dev" "-p" "sc-rpc-api:0.10.0-dev" "-p" "sp-application-crypto:6.0.0" "-p" "pallet-offences:4.0.0-dev" "-p" "sc-rpc:4.0.0-dev" "-p" "sp-database:4.0.0-dev" "-p" "sp-consensus-vrf:0.10.0-dev" "-p" "sp-sandbox:0.10.0-dev" "-p" "pallet-transaction-payment:4.0.0-dev" "-p" "sp-inherents:4.0.0-dev" "-p" "pallet-transaction-payment-rpc:4.0.0-dev" "-p" "beefy-gadget:4.0.0-dev" "-p" "sc-consensus-slots:0.10.0-dev" "-p" "frame-system-rpc-runtime-api:4.0.0-dev" "-p" "substrate-state-trie-migration-rpc:4.0.0-dev" "-p" "sc-network-sync:0.10.0-dev" "-p" "sp-state-machine:0.12.0" "-p" "sc-consensus-babe-rpc:0.10.0-dev" "-p" "substrate-test-client:2.0.1" "-p" "beefy-primitives:4.0.0-dev" "-p" "pallet-nomination-pools-benchmarking:1.0.0" "-p" "sp-version-proc-macro:4.0.0-dev" "-p" "sp-tracing:5.0.0" "-p" "sp-staking:4.0.0-dev" "-p" "pallet-nomination-pools:1.0.0" "-p" "pallet-identity:4.0.0-dev" "-p" "pallet-sudo:4.0.0-dev" "-p" "sc-finality-grandpa:0.10.0-dev" "-p" "sp-core-hashing-proc-macro:5.0.0" "-p" "pallet-balances:4.0.0-dev" "-p" "pallet-society:4.0.0-dev" "-p" "sc-chain-spec-derive:4.0.0-dev" "-p" "substrate-prometheus-endpoint:0.10.0-dev" "-p" "pallet-authority-discovery:4.0.0-dev" "-p" "pallet-mmr-rpc:3.0.0" "-p" "substrate-test-utils-derive:0.10.0-dev" "-p" "beefy-merkle-tree:4.0.0-dev" "-p" "pallet-membership:4.0.0-dev" "-p" "sp-debug-derive:4.0.0" "-p" "frame-election-provider-support:4.0.0-dev" "-p" "frame-support:4.0.0-dev" "-p" "pallet-staking-reward-curve:4.0.0-dev" "-p" "generate-bags:4.0.0-dev" "-p" "pallet-treasury:4.0.0-dev" "-p" "sp-runtime-interface:6.0.0" "-p" "pallet-recovery:4.0.0-dev" "-p" "sc-chain-spec:4.0.0-dev" "-p" "sc-rpc-server:4.0.0-dev" "-p" "sc-informant:0.10.0-dev" "-p" "sc-executor-common:0.10.0-dev" "-p" "sp-wasm-interface:6.0.0" "-p" "sp-session:4.0.0-dev" "-p" "sc-consensus-epochs:0.10.0-dev" "-p" "pallet-beefy:4.0.0-dev" "-p" "sc-tracing:4.0.0-dev" "-p" "sc-tracing-proc-macro:4.0.0-dev" "-p" "sp-runtime-interface-proc-macro:5.0.0" "-p" "pallet-elections-phragmen:5.0.0-dev" "-p" "sc-transaction-pool:4.0.0-dev" "-p" "sp-finality-grandpa:4.0.0-dev" "-p" "sc-state-db:0.10.0-dev" "-p" "sp-core-hashing:4.0.0" "-p" "substrate-test-utils:4.0.0-dev" "-p" "pallet-timestamp:4.0.0-dev" "-p" "pallet-collective:4.0.0-dev" "-p" "pallet-election-provider-support-benchmarking:4.0.0-dev" "-p" "sp-api:4.0.0-dev" "-p" "frame-support-procedural-tools:4.0.0-dev" "-p" "sp-transaction-storage-proof:4.0.0-dev" "-p" "pallet-assets:4.0.0-dev" "-p" "pallet-authorship:4.0.0-dev" "-p" "sp-io:6.0.0" "-p" "sp-keyring:6.0.0" "-p" "sp-mmr-primitives:4.0.0-dev" "-p" "sc-keystore:4.0.0-dev" "-p" "sc-consensus-babe:0.10.0-dev" "-p" "frame-benchmarking-cli:4.0.0-dev" "-p" "sp-transaction-pool:4.0.0-dev" "-p" "sc-offchain:4.0.0-dev" "-p" "sc-cli:0.10.0-dev" "-p" "pallet-offences-benchmarking:4.0.0-dev" "-p" "sc-basic-authorship:0.10.0-dev" "-p" "sc-executor-wasmtime:0.10.0-dev" "-p" "frame-support-procedural-tools-derive:3.0.0" "-p" "sp-timestamp:4.0.0-dev" "-p" "sc-finality-grandpa-rpc:0.10.0-dev" "-p" "sp-authority-discovery:4.0.0-dev" "-p" "pallet-mmr:4.0.0-dev" "-p" "frame-benchmarking:4.0.0-dev" "-p" "sp-authorship:4.0.0-dev" "-p" "sp-api-proc-macro:4.0.0-dev" "-p" "sc-executor-wasmi:0.10.0-dev" "-p" "pallet-bags-list:4.0.0-dev" "-p" "sc-consensus:0.10.0-dev" "-p" "frame-support-test-pallet:4.0.0-dev" "-p" "pallet-im-online:4.0.0-dev" "-p" "sc-network:0.10.0-dev" "-p" "sc-transaction-pool-api:4.0.0-dev" "-p" "sp-panic-handler:4.0.0" "-p" "sp-trie:6.0.0" "-p" "frame-system:4.0.0-dev" "-p" "sp-npos-elections:4.0.0-dev" "-p" "pallet-democracy:4.0.0-dev" "-p" "sp-maybe-compressed-blob:4.1.0-dev" "-p" "pallet-nomination-pools-runtime-api:1.0.0-dev" "-p" "fork-tree:3.0.0" "-p" "pallet-babe:4.0.0-dev" "-p" "frame-support-test:3.0.0" "-p" "pallet-transaction-payment-rpc-runtime-api:4.0.0-dev" "-p" "frame-executive:4.0.0-dev" "-p" "sc-allocator:4.1.0-dev" "-p" "pallet-grandpa:4.0.0-dev" "-p" "pallet-staking-reward-fn:4.0.0-dev" "-p" "sc-network-common:0.10.0-dev" "-p" "sp-consensus-babe:0.10.0-dev" "-p" "sp-consensus-slots:0.10.0-dev" "-p" "pallet-session-benchmarking:4.0.0-dev" "-p" "sc-authority-discovery:0.10.0-dev" "-p" "sp-externalities:0.12.0" "-p" "pallet-scheduler:4.0.0-dev" "-p" "sc-sync-state-rpc:0.10.0-dev" "-p" "sp-rpc:6.0.0" "-p" "pallet-child-bounties:4.0.0-dev" "-p" "pallet-vesting:4.0.0-dev" "-p" "pallet-tips:4.0.0-dev" "-p" "sp-version:5.0.0" "-p" "substrate-build-script-utils:3.0.0" "-p" "pallet-bounties:4.0.0-dev" "-p" "sp-blockchain:4.0.0-dev" "-p" "try-runtime-cli:0.10.0-dev" "-p" "pallet-proxy:4.0.0-dev" "-p" "sc-utils:4.0.0-dev" "-p" "sp-std:4.0.0" "-p" "pallet-utility:4.0.0-dev" "-p" "sp-block-builder:4.0.0-dev" "-p" "pallet-preimage:4.0.0-dev" "-p" "sc-client-db:0.10.0-dev" "-p" "sp-runtime:6.0.0" "-p" "sc-executor:0.10.0-dev" "-p" "substrate-frame-rpc-system:4.0.0-dev" "-p" "sc-client-api:4.0.0-dev" "-p" "sc-network-light:0.10.0-dev" "-p" "sc-block-builder:0.10.0-dev" "-p" "pallet-gilt:4.0.0-dev" "-p" "remote-externalities:0.10.0-dev" "-p" "sc-telemetry:4.0.0-dev" "-p" "pallet-multisig:4.0.0-dev" "-p" "sp-storage:6.0.0" "-p" "sp-tasks:4.0.0-dev" "-p" "sc-network-gossip:0.10.0-dev" "-p" "pallet-beefy-mmr:4.0.0-dev" "-p" "frame-election-provider-solution-type:4.0.0-dev" "-p" "frame-support-procedural:4.0.0-dev" "-p" "sc-service:0.10.0-dev" "-p" "pallet-election-provider-multi-phase:4.0.0-dev" "-p" "frame-try-runtime:0.10.0-dev" "-p" "sp-consensus:0.10.0-dev", kill_on_drop: false }' failed with status Some(101); output: error: There are multiple sp-core packages in your project, and the specification sp-core:6.0.0 is ambiguous.
Please re-run this command with -p <spec> where <spec> is one of the following:
https://github.com/paritytech/substrate#sp-core:6.0.0
https://github.com/paritytech/substrate#sp-core:6.0.0

@bkchr
Copy link
Member Author

bkchr commented Aug 18, 2022

bot merge

@paritytech-processbot
Copy link

Waiting for commit status.

@paritytech-processbot
Copy link

Merge cancelled due to error. Error: Statuses failed for 7d98798

@bkchr
Copy link
Member Author

bkchr commented Aug 18, 2022

bot merge force

@paritytech-processbot paritytech-processbot bot merged commit 160bb84 into master Aug 18, 2022
@paritytech-processbot paritytech-processbot bot deleted the bkchr-new-trie-cache branch August 18, 2022 21:35
ordian added a commit that referenced this pull request Aug 29, 2022
@ordian
Merge branch 'master' into ao-disputes-rewards
e71e64c 
* master: (23 commits)
  Bump futures-util from 0.3.21 to 0.3.23 (#5922)
  Companion for 12095 (#5924)
  use generated preimage weight (#5904)
  Update Substrate to make companion check happy (#5934)
  Fix wrong logic. (#5931)
  update weights (#5911)
  Clean up MigrateToV10 (#5921)
  Bump async-trait from 0.1.56 to 0.1.57 (#5919)
  Send back empty votes + log in approval-voting in case candidate entry is missing. (#5925)
  chore: bump zombienet version (#5914)
  Bump indexmap from 1.9.0 to 1.9.1 (#5918)
  Bump proc-macro2 from 1.0.40 to 1.0.43 (#5878)
  Bump hyper from 0.14.19 to 0.14.20 (#5901)
  Fix output file for updating weights in run_benches_for_runtime.sh (#5906)
  Companion to Substrate PR 12006 (#5913)
  pin gha versions (#5916)
  Companion for new Trie cache (#5897)
  [ci] Add check-runtime-migration job (#5891)
  Governance 2 (Part 1, Non-Controversial Changes) (#5892)
  Added Dwellir bootnodes for Kusama and Polkadot (#5772)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@arkpar arkpar arkpar approved these changes

@skunert skunert skunert approved these changes

@cheme cheme cheme approved these changes

Assignees
No one assigned
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@bkchr @paritytech-cicd-pr @cheme @skunert @arkpar