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

Companion for paritytech/polkadot#6744: Retire OldV1SessionInfo #2213

Merged
merged 22 commits into from
Feb 20, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0ea7ea6
Adjust commands
pmikolajczyk41 Jan 17, 2023
f85fa08
Use `NetworkWorker::next_action()` instead of `poll()`
dmitry-markin Jan 23, 2023
7816cf5
rustfmt
dmitry-markin Jan 23, 2023
5fb62ad
minor: fix mutability
dmitry-markin Jan 23, 2023
e8d6b05
Move imports
pmikolajczyk41 Feb 2, 2023
4d230d1
Replace `NetworkWorker::next_action()` with `run()`
dmitry-markin Feb 6, 2023
8de462c
Merge remote-tracking branch 'origin/master' into dm-network-service-…
dmitry-markin Feb 6, 2023
117d0ba
Merge remote-tracking branch 'origin/master' into dm-network-service-…
dmitry-markin Feb 8, 2023
4914bc8
Merge remote-tracking branch 'origin/master' into piomiko/try-runtime…
pmikolajczyk41 Feb 13, 2023
301c4f6
Import fix
pmikolajczyk41 Feb 13, 2023
949ab4c
Make `NetworkWorker::run` consume self
dmitry-markin Feb 15, 2023
03d2053
Merge remote-tracking branch 'origin/master' into dm-network-service-…
dmitry-markin Feb 15, 2023
d536ef1
Merge remote-tracking branch 'origin/master' into piomiko/try-runtime…
pmikolajczyk41 Feb 15, 2023
0141497
Merge remote-tracking branch 'origin/master' into piomiko/try-runtime…
pmikolajczyk41 Feb 17, 2023
79d4e91
Retire `OldV1SessionInfo`
s0me0ne-unkn0wn Feb 19, 2023
bc76511
update lockfile for {"polkadot", "substrate"}
Feb 20, 2023
9987754
Merge remote-tracking branch 'origin/master' into dm-network-service-…
Feb 20, 2023
22dd46a
update lockfile for {"substrate", "polkadot"}
Feb 20, 2023
5a6a472
Merge remote-tracking branch 'origin/dm-network-service-async-await' …
ggwpez Feb 20, 2023
f791db6
update lockfile for {"substrate", "polkadot"}
Feb 20, 2023
01c521a
Merge remote-tracking branch 'pmi/piomiko/try-runtime/fast-forward' i…
ggwpez Feb 20, 2023
755e9da
Make stuff compile
ggwpez Feb 20, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions client/relay-chain-minimal-node/src/blockchain_rpc_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,14 +253,6 @@ impl RuntimeApiSubsystemClient for BlockChainRpcClient {
Ok(self.rpc_client.parachain_host_session_info(at, index).await?)
}

async fn session_info_before_version_2(
&self,
at: Hash,
index: polkadot_primitives::SessionIndex,
) -> Result<Option<polkadot_primitives::OldV1SessionInfo>, sp_api::ApiError> {
Ok(self.rpc_client.parachain_host_session_info_before_version_2(at, index).await?)
}

async fn session_executor_params(
&self,
at: Hash,
Expand Down
17 changes: 3 additions & 14 deletions client/relay-chain-rpc-interface/src/rpc_client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ use cumulus_primitives_core::{
relay_chain::{
vstaging::ExecutorParams, CandidateCommitments, CandidateEvent, CandidateHash,
CommittedCandidateReceipt, CoreState, DisputeState, GroupRotationInfo, Hash as RelayHash,
Header as RelayHeader, InboundHrmpMessage, OccupiedCoreAssumption, OldV1SessionInfo,
PvfCheckStatement, ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode,
ValidationCodeHash, ValidatorId, ValidatorIndex, ValidatorSignature,
Header as RelayHeader, InboundHrmpMessage, OccupiedCoreAssumption, PvfCheckStatement,
ScrapedOnChainVotes, SessionIndex, SessionInfo, ValidationCode, ValidationCodeHash,
ValidatorId, ValidatorIndex, ValidatorSignature,
},
InboundDownwardMessage, ParaId, PersistedValidationData,
};
Expand Down Expand Up @@ -135,17 +135,6 @@ impl RelayChainRpcClient {
self.call_remote_runtime_function("BabeApi_current_epoch", at, None::<()>).await
}

/// Old method to fetch v1 session info.
pub async fn parachain_host_session_info_before_version_2(
&self,
at: RelayHash,
index: SessionIndex,
) -> Result<Option<OldV1SessionInfo>, RelayChainError> {
// The function in wasm never changes/gets augmented with a version
self.call_remote_runtime_function("ParachainHost_session_info", at, Some(index))
.await
}

/// Scrape dispute relevant from on-chain, backing votes and resolved disputes.
pub async fn parachain_host_on_chain_votes(
&self,
Expand Down