chore: regenerate umbrella crate, fix feature propagation
This commit is contained in:
@@ -163,6 +163,7 @@ where
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
use bizinikiwi_test_runtime_client::runtime::Block;
|
||||
use codec::{Decode, Encode};
|
||||
use jsonrpsee::{core::EmptyServerParams as EmptyParams, RpcModule};
|
||||
use pezsc_consensus_beefy::{
|
||||
@@ -171,7 +172,6 @@ mod tests {
|
||||
};
|
||||
use pezsp_consensus_beefy::{ecdsa_crypto, known_payloads, Payload, SignedCommitment};
|
||||
use pezsp_runtime::traits::{BlakeTwo256, Hash};
|
||||
use bizinikiwi_test_runtime_client::runtime::Block;
|
||||
|
||||
fn setup_io_handler() -> (
|
||||
RpcModule<Beefy<Block, ecdsa_crypto::AuthorityId>>,
|
||||
@@ -190,9 +190,12 @@ mod tests {
|
||||
let (finality_proof_sender, finality_proof_stream) =
|
||||
BeefyVersionedFinalityProofStream::<Block, ecdsa_crypto::AuthorityId>::channel();
|
||||
|
||||
let handler =
|
||||
Beefy::new(finality_proof_stream, best_block_stream, pezsc_rpc::testing::test_executor())
|
||||
.expect("Setting up the BEEFY RPC handler works");
|
||||
let handler = Beefy::new(
|
||||
finality_proof_stream,
|
||||
best_block_stream,
|
||||
pezsc_rpc::testing::test_executor(),
|
||||
)
|
||||
.expect("Setting up the BEEFY RPC handler works");
|
||||
|
||||
(handler.into_rpc(), finality_proof_sender)
|
||||
}
|
||||
|
||||
@@ -607,7 +607,12 @@ pub(crate) mod tests {
|
||||
unimplemented!()
|
||||
}
|
||||
|
||||
fn send_topic(&mut self, _who: &pezsc_network_types::PeerId, _topic: B::Hash, _force: bool) {
|
||||
fn send_topic(
|
||||
&mut self,
|
||||
_who: &pezsc_network_types::PeerId,
|
||||
_topic: B::Hash,
|
||||
_force: bool,
|
||||
) {
|
||||
unimplemented!()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -81,12 +81,12 @@ pub(crate) fn verify_with_validator_set<'a, Block: BlockT, AuthorityId: Authorit
|
||||
|
||||
#[cfg(test)]
|
||||
pub(crate) mod tests {
|
||||
use bizinikiwi_test_runtime_client::runtime::Block;
|
||||
use codec::Encode;
|
||||
use pezsp_consensus_beefy::{
|
||||
ecdsa_crypto, known_payloads, test_utils::Keyring, Commitment, Payload, SignedCommitment,
|
||||
VersionedFinalityProof,
|
||||
};
|
||||
use bizinikiwi_test_runtime_client::runtime::Block;
|
||||
|
||||
use super::*;
|
||||
use crate::tests::make_beefy_ids;
|
||||
|
||||
@@ -34,7 +34,6 @@ use crate::{
|
||||
use futures::{stream::Fuse, FutureExt, StreamExt};
|
||||
use log::{debug, error, info, trace, warn};
|
||||
use parking_lot::Mutex;
|
||||
use prometheus_endpoint::Registry;
|
||||
use pezsc_client_api::{Backend, BlockBackend, BlockchainEvents, FinalityNotification, Finalizer};
|
||||
use pezsc_consensus::BlockImport;
|
||||
use pezsc_network::{NetworkRequest, NotificationService, ProtocolName};
|
||||
@@ -48,6 +47,7 @@ use pezsp_consensus_beefy::{
|
||||
};
|
||||
use pezsp_keystore::KeystorePtr;
|
||||
use pezsp_runtime::traits::{Block, Header as HeaderT, NumberFor, Zero};
|
||||
use prometheus_endpoint::Registry;
|
||||
use std::{
|
||||
collections::{BTreeMap, VecDeque},
|
||||
future::Future,
|
||||
@@ -557,8 +557,9 @@ pub async fn start_beefy_gadget<B, BE, C, N, P, R, S, AuthorityId>(
|
||||
|
||||
let mut block_import_justif = links.from_block_import_justif_stream.subscribe(100_000).fuse();
|
||||
|
||||
// Subscribe to finality notifications and justifications before waiting for runtime pezpallet and
|
||||
// reuse the streams, so we don't miss notifications while waiting for pezpallet to be available.
|
||||
// Subscribe to finality notifications and justifications before waiting for runtime pezpallet
|
||||
// and reuse the streams, so we don't miss notifications while waiting for pezpallet to be
|
||||
// available.
|
||||
let finality_notifications = client.finality_notification_stream();
|
||||
let (mut transformer, mut finality_notifications) =
|
||||
finality_notification_transformer_future(finality_notifications);
|
||||
|
||||
@@ -36,6 +36,7 @@ use crate::{
|
||||
worker::PersistedState,
|
||||
BeefyRPCLinks, BeefyVoterLinks, BeefyWorkerBuilder, KnownPeers, UnpinnedFinalityNotification,
|
||||
};
|
||||
use bizinikiwi_test_runtime_client::{BlockBuilderExt, ClientExt};
|
||||
use futures::{
|
||||
future,
|
||||
stream::{Fuse, FuturesUnordered},
|
||||
@@ -43,7 +44,9 @@ use futures::{
|
||||
};
|
||||
use parking_lot::Mutex;
|
||||
use pezsc_block_builder::BlockBuilderBuilder;
|
||||
use pezsc_client_api::{Backend as BackendT, BlockchainEvents, FinalityNotifications, HeaderBackend};
|
||||
use pezsc_client_api::{
|
||||
Backend as BackendT, BlockchainEvents, FinalityNotifications, HeaderBackend,
|
||||
};
|
||||
use pezsc_consensus::{
|
||||
BlockImport, BlockImportParams, BoxJustificationImport, ForkChoiceStrategy, ImportResult,
|
||||
ImportedAux,
|
||||
@@ -54,7 +57,6 @@ use pezsc_network_test::{
|
||||
PeersFullClient, TestNetFactory,
|
||||
};
|
||||
use pezsc_utils::{mpsc::TracingUnboundedReceiver, notification::NotificationReceiver};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use pezsp_api::{ApiRef, ProvideRuntimeApi};
|
||||
use pezsp_application_crypto::key_types::BEEFY as BEEFY_KEY_TYPE;
|
||||
use pezsp_consensus::BlockOrigin;
|
||||
@@ -76,8 +78,8 @@ use pezsp_runtime::{
|
||||
traits::{Header as HeaderT, NumberFor},
|
||||
BuildStorage, DigestItem, EncodedJustification, Justifications, Storage,
|
||||
};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{marker::PhantomData, sync::Arc, task::Poll};
|
||||
use bizinikiwi_test_runtime_client::{BlockBuilderExt, ClientExt};
|
||||
use tokio::time::Duration;
|
||||
|
||||
const GENESIS_HASH: H256 = H256::zero();
|
||||
@@ -1395,7 +1397,8 @@ async fn beefy_finalizing_after_pallet_genesis() {
|
||||
|
||||
// Minimum BEEFY block delta is 1.
|
||||
|
||||
// GRANDPA finalize blocks leading up to BEEFY pezpallet genesis -> BEEFY should finalize nothing.
|
||||
// GRANDPA finalize blocks leading up to BEEFY pezpallet genesis -> BEEFY should finalize
|
||||
// nothing.
|
||||
finalize_block_and_wait_for_beefy(&net, peers.clone(), &hashes[14], &[]).await;
|
||||
|
||||
// GRANDPA finalize block #16 -> BEEFY should finalize #15 (genesis mandatory) and #16.
|
||||
|
||||
@@ -1035,6 +1035,10 @@ pub(crate) mod tests {
|
||||
},
|
||||
BeefyRPCLinks, KnownPeers,
|
||||
};
|
||||
use bizinikiwi_test_runtime_client::{
|
||||
runtime::{Block, Digest, DigestItem, Header},
|
||||
Backend,
|
||||
};
|
||||
use futures::{future::poll_fn, task::Poll};
|
||||
use parking_lot::Mutex;
|
||||
use pezsc_client_api::{Backend as BackendT, HeaderBackend};
|
||||
@@ -1050,10 +1054,6 @@ pub(crate) mod tests {
|
||||
ConsensusLog, Payload, SignedCommitment,
|
||||
};
|
||||
use pezsp_runtime::traits::{Header as HeaderT, One};
|
||||
use bizinikiwi_test_runtime_client::{
|
||||
runtime::{Block, Digest, DigestItem, Header},
|
||||
Backend,
|
||||
};
|
||||
|
||||
impl<B: super::Block, AuthorityId: AuthorityIdBound> PersistedState<B, AuthorityId> {
|
||||
pub fn active_round(&self) -> Result<&Rounds<B, AuthorityId>, Error> {
|
||||
|
||||
Reference in New Issue
Block a user