Move non runtime related stuff into node/primitives (#2743)

* Remove stuff out of the runtime that does not belong there.

There might be more, but it is a start.

* White space fixes.

* Fix tests.

* Leave whitespace in ui tests alone.

* Add back zstd for no reason.

* Fix browser wasm (hopefully)
This commit is contained in:
Robert Klotzner
2021-03-29 02:15:44 +02:00
committed by GitHub
parent a6fd8f78e6
commit 0a9fe852df
46 changed files with 380 additions and 345 deletions
@@ -22,8 +22,8 @@ use futures::{select, FutureExt, channel::oneshot};
use sp_core::Pair;
use polkadot_primitives::v1::{
CandidateHash, CandidateReceipt, CollatorPair, CompressedPoV, CoreIndex, CoreState, Hash,
Id as ParaId, PoV, ValidatorId
CandidateHash, CandidateReceipt, CollatorPair, CoreIndex, CoreState, Hash,
Id as ParaId, ValidatorId
};
use polkadot_subsystem::{
jaeger, PerLeafSpan,
@@ -42,7 +42,7 @@ use polkadot_node_subsystem_util::{
request_availability_cores_ctx,
metrics::{self, prometheus},
};
use polkadot_node_primitives::{SignedFullStatement, Statement};
use polkadot_node_primitives::{SignedFullStatement, Statement, PoV, CompressedPoV};
#[derive(Clone, Default)]
pub struct Metrics(Option<MetricsInner>);
@@ -949,9 +949,10 @@ mod tests {
};
use polkadot_node_subsystem_util::TimeoutExt;
use polkadot_primitives::v1::{
AuthorityDiscoveryId, BlockData, CandidateDescriptor, CollatorPair, GroupRotationInfo,
AuthorityDiscoveryId, CandidateDescriptor, CollatorPair, GroupRotationInfo,
ScheduledCore, SessionIndex, SessionInfo, ValidatorIndex,
};
use polkadot_node_primitives::BlockData;
use polkadot_subsystem::{
jaeger,
messages::{RuntimeApiMessage, RuntimeApiRequest},
@@ -32,9 +32,9 @@ use polkadot_node_network_protocol::{
},
OurView, PeerId, UnifiedReputationChange as Rep, View,
};
use polkadot_node_primitives::{SignedFullStatement, Statement};
use polkadot_node_primitives::{SignedFullStatement, Statement, PoV};
use polkadot_node_subsystem_util::metrics::{self, prometheus};
use polkadot_primitives::v1::{CandidateReceipt, CollatorId, Hash, Id as ParaId, PoV};
use polkadot_primitives::v1::{CandidateReceipt, CollatorId, Hash, Id as ParaId};
use polkadot_subsystem::{
jaeger,
messages::{
@@ -896,7 +896,8 @@ mod tests {
use sp_core::{crypto::Pair, Encode};
use assert_matches::assert_matches;
use polkadot_primitives::v1::{BlockData, CollatorPair, CompressedPoV};
use polkadot_primitives::v1::CollatorPair;
use polkadot_node_primitives::{BlockData, CompressedPoV};
use polkadot_subsystem_testhelpers as test_helpers;
use polkadot_node_network_protocol::{our_view, ObservedRole,
request_response::Requests