chore: regenerate umbrella crate, fix feature propagation

bizinikiwi/client/network/sync/src/block_announce_validator.rs

@@ -309,9 +309,9 @@ impl<B: BlockT> FusedStream for BlockAnnounceValidator<B> {
 mod tests {
 	use super::*;
 	use crate::block_announce_validator::AllocateSlotForBlockAnnounceValidation;
+	use bizinikiwi_test_runtime_client::runtime::Block;
 	use pezsc_network_types::PeerId;
 	use pezsp_consensus::block_validation::DefaultBlockAnnounceValidator;
-	use bizinikiwi_test_runtime_client::runtime::Block;
 
 	#[test]
 	fn allocate_one_validation_slot() {

bizinikiwi/client/network/sync/src/justification_requests.rs

@@ -24,14 +24,14 @@ use crate::{
 	strategy::chain_sync::{PeerSync, PeerSyncState},
 	LOG_TARGET,
 };
-use pez_fork_tree::ForkTree;
 use log::{debug, trace, warn};
-use prometheus_endpoint::{
-	prometheus::core::GenericGauge, register, GaugeVec, Opts, PrometheusError, Registry, U64,
-};
+use pez_fork_tree::ForkTree;
 use pezsc_network_types::PeerId;
 use pezsp_blockchain::Error as ClientError;
 use pezsp_runtime::traits::{Block as BlockT, NumberFor, Zero};
+use prometheus_endpoint::{
+	prometheus::core::GenericGauge, register, GaugeVec, Opts, PrometheusError, Registry, U64,
+};
 use std::{
 	collections::{HashMap, HashSet, VecDeque},
 	time::{Duration, Instant},
@@ -441,9 +441,9 @@ impl<'a, B: BlockT> Matcher<'a, B> {
 mod tests {
 	use super::*;
 	use crate::strategy::chain_sync::PeerSync;
-	use quickcheck::{Arbitrary, Gen, QuickCheck};
 	use pezsp_blockchain::Error as ClientError;
 	use pezsp_test_primitives::{Block, BlockNumber, Hash};
+	use quickcheck::{Arbitrary, Gen, QuickCheck};
 	use std::collections::{HashMap, HashSet};
 
 	#[test]

bizinikiwi/client/network/sync/src/state_request_handler.rs

@@ -26,8 +26,8 @@ use crate::{
 use codec::{Decode, Encode};
 use futures::{channel::oneshot, stream::StreamExt};
 use log::{debug, trace};
-use prost::Message;
 use pezsc_network_types::PeerId;
+use prost::Message;
 use schnellru::{ByLength, LruMap};
 
 use pezsc_client_api::{BlockBackend, ProofProvider};

bizinikiwi/client/network/sync/src/strategy/chain_sync.rs

@@ -46,8 +46,6 @@ use crate::{
 
 use futures::{channel::oneshot, FutureExt};
 use log::{debug, error, info, trace, warn};
-use prometheus_endpoint::{register, Gauge, PrometheusError, Registry, U64};
-use prost::Message;
 use pezsc_client_api::{blockchain::BlockGap, BlockBackend, ProofProvider};
 use pezsc_consensus::{BlockImportError, BlockImportStatus, IncomingBlock};
 use pezsc_network::{IfDisconnected, ProtocolName};
@@ -64,6 +62,8 @@ use pezsp_runtime::{
 	},
 	EncodedJustification, Justifications,
 };
+use prometheus_endpoint::{register, Gauge, PrometheusError, Registry, U64};
+use prost::Message;
 
 use std::{
 	any::Any,
@@ -142,8 +142,10 @@ impl Metrics {
 	fn register(r: &Registry) -> Result<Self, PrometheusError> {
 		Ok(Self {
 			queued_blocks: {
-				let g =
-					Gauge::new("bizinikiwi_sync_queued_blocks", "Number of blocks in import queue")?;
+				let g = Gauge::new(
+					"bizinikiwi_sync_queued_blocks",
+					"Number of blocks in import queue",
+				)?;
 				register(g, r)?
 			},
 			fork_targets: {

bizinikiwi/client/network/sync/src/strategy/chain_sync/test.rs

@@ -23,17 +23,17 @@ use crate::{
 	block_relay_protocol::BlockResponseError, mock::MockBlockDownloader,
 	service::network::NetworkServiceProvider,
 };
+use bizinikiwi_test_runtime_client::{
+	runtime::{Block, Hash, Header},
+	BlockBuilderExt, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt, TestClient,
+	TestClientBuilder, TestClientBuilderExt,
+};
 use futures::{channel::oneshot::Canceled, executor::block_on};
 use pezsc_block_builder::BlockBuilderBuilder;
 use pezsc_network::RequestFailure;
 use pezsc_network_common::sync::message::{BlockAnnounce, BlockData, BlockState, FromBlock};
 use pezsp_blockchain::HeaderBackend;
 use std::sync::Mutex;
-use bizinikiwi_test_runtime_client::{
-	runtime::{Block, Hash, Header},
-	BlockBuilderExt, ClientBlockImportExt, ClientExt, DefaultTestClientBuilderExt, TestClient,
-	TestClientBuilder, TestClientBuilderExt,
-};
 
 #[derive(Debug)]
 struct ProxyBlockDownloader {

bizinikiwi/client/network/sync/src/strategy/pezkuwi.rs

@@ -33,7 +33,6 @@ use crate::{
 	LOG_TARGET,
 };
 use log::{debug, error, info, warn};
-use prometheus_endpoint::Registry;
 use pezsc_client_api::{BlockBackend, ProofProvider};
 use pezsc_consensus::{BlockImportError, BlockImportStatus};
 use pezsc_network::ProtocolName;
@@ -41,6 +40,7 @@ use pezsc_network_common::sync::{message::BlockAnnounce, SyncMode};
 use pezsc_network_types::PeerId;
 use pezsp_blockchain::{Error as ClientError, HeaderBackend, HeaderMetadata};
 use pezsp_runtime::traits::{Block as BlockT, Header, NumberFor};
+use prometheus_endpoint::Registry;
 use std::{any::Any, collections::HashMap, sync::Arc};
 
 /// Corresponding `ChainSync` mode.

bizinikiwi/client/network/sync/src/strategy/state.rs

@@ -31,7 +31,6 @@ use crate::{
 };
 use futures::{channel::oneshot, FutureExt};
 use log::{debug, error, trace};
-use prost::Message;
 use pezsc_client_api::ProofProvider;
 use pezsc_consensus::{BlockImportError, BlockImportStatus, IncomingBlock};
 use pezsc_network::{IfDisconnected, ProtocolName};
@@ -42,6 +41,7 @@ use pezsp_runtime::{
 	traits::{Block as BlockT, Header, NumberFor},
 	Justifications, SaturatedConversion,
 };
+use prost::Message;
 use std::{any::Any, collections::HashMap, sync::Arc};
 
 mod rep {
@@ -398,16 +398,16 @@ mod test {
 		service::network::NetworkServiceProvider,
 		strategy::state_sync::{ImportResult, StateSyncProgress, StateSyncProvider},
 	};
+	use bizinikiwi_test_runtime_client::{
+		runtime::{Block, Hash},
+		BlockBuilderExt, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
+	};
 	use codec::Decode;
 	use pezsc_block_builder::BlockBuilderBuilder;
 	use pezsc_client_api::KeyValueStates;
 	use pezsc_consensus::{ImportedAux, ImportedState};
 	use pezsp_core::H256;
 	use pezsp_runtime::traits::Zero;
-	use bizinikiwi_test_runtime_client::{
-		runtime::{Block, Hash},
-		BlockBuilderExt, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
-	};
 
 	mockall::mock! {
 		pub StateSync<B: BlockT> {}

bizinikiwi/client/network/sync/src/strategy/state_sync.rs

@@ -26,12 +26,12 @@ use codec::{Decode, Encode};
 use log::debug;
 use pezsc_client_api::{CompactProof, KeyValueStates, ProofProvider};
 use pezsc_consensus::ImportedState;
-use smallvec::SmallVec;
 use pezsp_core::storage::well_known_keys;
 use pezsp_runtime::{
 	traits::{Block as BlockT, Header, NumberFor},
 	Justifications,
 };
+use smallvec::SmallVec;
 use std::{collections::HashMap, fmt, sync::Arc};
 
 /// Generic state sync provider. Used for mocking in tests.

bizinikiwi/client/network/sync/src/strategy/warp.rs

@@ -772,16 +772,16 @@ where
 mod test {
 	use super::*;
 	use crate::{mock::MockBlockDownloader, service::network::NetworkServiceProvider};
+	use bizinikiwi_test_runtime_client::{
+		runtime::{Block, Hash},
+		BlockBuilderExt, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
+	};
 	use pezsc_block_builder::BlockBuilderBuilder;
 	use pezsp_blockchain::{BlockStatus, Error as BlockchainError, HeaderBackend, Info};
 	use pezsp_consensus_grandpa::{AuthorityList, SetId, GRANDPA_ENGINE_ID};
 	use pezsp_core::H256;
 	use pezsp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
 	use std::{io::ErrorKind, sync::Arc};
-	use bizinikiwi_test_runtime_client::{
-		runtime::{Block, Hash},
-		BlockBuilderExt, DefaultTestClientBuilderExt, TestClientBuilder, TestClientBuilderExt,
-	};
 
 	mockall::mock! {
 		pub Client<B: BlockT> {}