Skip to content

Commit 5074408

Browse files
authored
remove: pallet-partner-chains-session (#1025)
1 parent be7f8b3 commit 5074408

File tree

14 files changed

+76
-713
lines changed

14 files changed

+76
-713
lines changed

Cargo.lock

Lines changed: 1 addition & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ members = [
1414
"toolkit/smart-contracts/commands",
1515
"substrate-extensions/aura/consensus",
1616
"toolkit/block-production-log/pallet",
17-
"substrate-extensions/partner-chains-session",
1817
"toolkit/committee-selection/pallet",
1918
"toolkit/committee-selection/pallet/benchmarking",
2019
"toolkit/committee-selection/rpc",
@@ -301,7 +300,6 @@ authority-selection-inherents = { path = "toolkit/committee-selection/authority-
301300
# substrate extensions
302301
sc-partner-chains-consensus-aura = { path = "substrate-extensions/aura/consensus", default-features = false }
303302
sp-partner-chains-consensus-aura = { path = "substrate-extensions/aura/primitives", default-features = false }
304-
pallet-partner-chains-session = { path = "substrate-extensions/partner-chains-session", default-features = false }
305303

306304
# block production and rewards
307305
pallet-block-production-log = { path = "toolkit/block-production-log/pallet", default-features = false }

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ This changelog is based on [Keep A Changelog](https://keepachangelog.com/en/1.1.
1010

1111
## Removed
1212

13+
* `pallet-partner-chains-session` has been removed. Partner Chains should use only the stock Substrate session pallet
14+
* `PalletSessionSupport` type provided by `pallet-session-validator-management`. The `SessionManager` and `ShouldEndSession`
15+
implementations were moved directly to the `Pallet` type instead.
16+
1317
## Fixed
1418

1519
## Added

demo/node/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ pallet-session-validator-management = { workspace = true }
6161
sp-session-validator-management = { workspace = true }
6262
sp-session-validator-management-query = { workspace = true }
6363
pallet-session-validator-management-rpc = { workspace = true }
64-
pallet-partner-chains-session = { workspace = true }
6564
serde = { workspace = true }
6665
serde_json = { workspace = true }
6766
substrate-prometheus-endpoint = { workspace = true }

demo/runtime/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ pallet-aura = { workspace = true }
2929
pallet-balances = { workspace = true }
3030
frame-support = { workspace = true }
3131
pallet-grandpa = { workspace = true }
32-
pallet-partner-chains-session = { workspace = true, features = [
33-
"pallet-session-compat",
34-
] }
3532
pallet-session = { workspace = true }
3633
pallet-sudo = { workspace = true }
3734
frame-system = { workspace = true }
@@ -129,7 +126,6 @@ std = [
129126
"pallet-block-production-log/std",
130127
"pallet-grandpa/std",
131128
"pallet-sudo/std",
132-
"pallet-partner-chains-session/std",
133129
"pallet-session-validator-management/std",
134130
"pallet-session-validator-management-benchmarking?/std",
135131
"pallet-timestamp/std",

demo/runtime/src/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use frame_system::EnsureRoot;
2727
use opaque::SessionKeys;
2828
use pallet_block_producer_metadata;
2929
use pallet_grandpa::AuthorityId as GrandpaId;
30-
use pallet_session_validator_management::pallet_session_support::PalletSessionSupport;
3130
use pallet_transaction_payment::{ConstFeeMultiplier, FungibleAdapter, Multiplier};
3231
use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
3332
use scale_info::TypeInfo;
@@ -309,9 +308,9 @@ impl pallet_session::Config for Runtime {
309308
type RuntimeEvent = RuntimeEvent;
310309
type ValidatorId = AccountId;
311310
type ValidatorIdOf = ConvertInto;
312-
type ShouldEndSession = PalletSessionSupport<Runtime>;
311+
type ShouldEndSession = SessionCommitteeManagement;
313312
type NextSessionRotation = ();
314-
type SessionManager = PalletSessionSupport<Runtime>;
313+
type SessionManager = SessionCommitteeManagement;
315314
type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
316315
type Keys = SessionKeys;
317316
type DisablingStrategy = pallet_session::disabling::UpToLimitWithReEnablingDisablingStrategy;

demo/runtime/src/mock.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ use frame_support::{
1010
};
1111
use frame_system::EnsureRoot;
1212
use hex_literal::hex;
13-
use pallet_session_validator_management::pallet_session_support::PalletSessionSupport;
1413
use plutus::ToDatum;
1514
use sidechain_domain::*;
1615
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -143,9 +142,9 @@ impl pallet_session::Config for Test {
143142
type RuntimeEvent = RuntimeEvent;
144143
type ValidatorId = <Self as frame_system::Config>::AccountId;
145144
type ValidatorIdOf = ConvertInto;
146-
type ShouldEndSession = PalletSessionSupport<Test>;
145+
type ShouldEndSession = SessionCommitteeManagement;
147146
type NextSessionRotation = ();
148-
type SessionManager = PalletSessionSupport<Test>;
147+
type SessionManager = SessionCommitteeManagement;
149148
type SessionHandler = <TestSessionKeys as OpaqueKeys>::KeyTypeIdProviders;
150149
type Keys = TestSessionKeys;
151150
type DisablingStrategy = pallet_session::disabling::UpToLimitWithReEnablingDisablingStrategy;

substrate-extensions/partner-chains-session/Cargo.toml

Lines changed: 0 additions & 46 deletions
This file was deleted.

0 commit comments

Comments
 (0)