Skip to content

Commit

Permalink
Merge branch 'main' into sv-pk-bridge-snowbridge
Browse files Browse the repository at this point in the history
  • Loading branch information
claravanstaden authored Feb 13, 2024
2 parents 6195418 + b4c3ad6 commit 1942302
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 36 deletions.
81 changes: 51 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions system-parachains/encointer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ encointer-balances-tx-payment = { default-features = false, version = "3.0.2" }
encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "3.0.2" }
encointer-primitives = { default-features = false, version = "3.0.2" }
pallet-encointer-balances = { default-features = false, version = "3.0.2" }
pallet-encointer-bazaar = { default-features = false, version = "3.0.2" }
pallet-encointer-bazaar = { default-features = false, version = "3.0.3" }
pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "3.0.2" }
pallet-encointer-ceremonies = { default-features = false, version = "3.0.2" }
pallet-encointer-ceremonies = { default-features = false, version = "3.0.4" }
pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "3.0.2" }
pallet-encointer-communities = { default-features = false, version = "3.0.2" }
pallet-encointer-communities = { default-features = false, version = "3.0.3" }
pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "3.0.2" }
pallet-encointer-faucet = { default-features = false, version = "3.0.2" }
pallet-encointer-faucet = { default-features = false, version = "3.0.3" }
pallet-encointer-reputation-commitments = { default-features = false, version = "3.0.2" }
pallet-encointer-scheduler = { default-features = false, version = "3.0.2" }
pallet-encointer-scheduler = { default-features = false, version = "3.0.3" }

# Substrate
frame-benchmarking = { default-features = false, optional = true, version = "25.0.0" }
Expand Down
3 changes: 2 additions & 1 deletion system-parachains/encointer/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,8 @@ mod benches {
[pallet_collective, Collective]
[pallet_membership, Membership]
[pallet_timestamp, Timestamp]
[pallet_treasury, Treasury]
// todo: treasury will be removed in separate PR, so no need to fix broken benchmarks: https://github.com/polkadot-fellows/runtimes/issues/176
//[pallet_treasury, Treasury]
[pallet_utility, Utility]
[pallet_proxy, Proxy]
[pallet_encointer_balances, EncointerBalances]
Expand Down

0 comments on commit 1942302

Please sign in to comment.