Merge remote-tracking branch 'origin/dharjeezy/bounds-on-enqueued-vot…

…es' into dharjeezy/bounds-on-enqueued-votes

# Conflicts:
#	client/beefy/src/lib.rs
#	client/beefy/src/worker.rs

client/beefy/src/lib.rs

@@ -1,4 +1,3 @@
-#![feature(map_try_insert)]
 // This file is part of Substrate.
 
 // Copyright (C) 2021-2022 Parity Technologies (UK) Ltd.
@@ -17,35 +16,6 @@
 // You should have received a copy of the GNU General Public License
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-use beefy_primitives::{BeefyApi, MmrRootHash, PayloadProvider};
-use parking_lot::Mutex;
-use prometheus::Registry;
-use sc_client_api::{Backend, BlockBackend, BlockchainEvents, Finalizer};
-use sc_consensus::BlockImport;
-use sc_network::ProtocolName;
-use sc_network_common::service::NetworkRequest;
-use sc_network_gossip::Network as GossipNetwork;
-use sp_api::{BlockT, HeaderT, NumberFor, ProvideRuntimeApi};
-use sp_blockchain::HeaderBackend;
-use sp_consensus::{Error as ConsensusError, SyncOracle};
-use sp_keystore::SyncCryptoStorePtr;
-use sp_mmr_primitives::MmrApi;
-use sp_runtime::traits::Block;
-use std::{marker::PhantomData, sync::Arc};
-
-mod error;
-mod keystore;
-mod metrics;
-mod round;
-mod worker;
-
-pub mod communication;
-pub mod import;
-pub mod justification;
-
-#[cfg(test)]
-mod tests;
-
 use crate::{
 	communication::{
 		notification::{
@@ -74,7 +44,7 @@ use sc_consensus::BlockImport;
 use sc_network::ProtocolName;
 use sc_network_common::service::NetworkRequest;
 use sc_network_gossip::{GossipEngine, Network as GossipNetwork};
-use sp_api::{HeaderT, NumberFor, ProvideRuntimeApi};
+use sp_api::{BlockT, HeaderT, NumberFor, ProvideRuntimeApi};
 use sp_blockchain::{
 	Backend as BlockchainBackend, Error as ClientError, HeaderBackend, Result as ClientResult,
 };

client/beefy/src/worker.rs

@@ -17,7 +17,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 use std::{
-	collections::{BTreeMap, BTreeSet, VecDeque, BufferedVec},
+	collections::{BTreeMap, BTreeSet, VecDeque},
 	fmt::Debug,
 	marker::PhantomData,
 	sync::Arc,
@@ -35,14 +35,16 @@ use sc_network_common::{
 };
 use sc_network_gossip::GossipEngine;
 
+use sp_arithmetic::traits::{AtLeast32Bit, Saturating};
 use sp_api::{BlockId, BlockT, HeaderT, ProvideRuntimeApi};
-use sp_arithmetic::traits::AtLeast32Bit;
 use sp_blockchain::Backend as BlockchainBackend;
 use sp_consensus::SyncOracle;
 use sp_mmr_primitives::MmrApi;
 use sp_runtime::{
 	generic::OpaqueDigestItemId,
-	traits::{Block, NumberFor},
+	traits::{Block, Header, NumberFor, Zero},
+	SaturatedConversion,
+	traits::{Block, NumberFor, CheckedConversion, ConstU32},
 	BoundedBTreeMap, SaturatedConversion,
 };
 
@@ -51,7 +53,7 @@ use beefy_primitives::{
 	BeefyApi, Commitment, ConsensusLog, MmrRootHash, Payload, PayloadProvider, SignedCommitment,
 	ValidatorSet, VersionedFinalityProof, VoteMessage, BEEFY_ENGINE_ID,
 };
-use sp_runtime::traits::{CheckedConversion, ConstU32};
+use sc_utils::notification::NotificationReceiver;
 
 use crate::{
 	communication::{
@@ -338,6 +340,8 @@ pub(crate) struct BeefyWorker<B: Block, BE, P, R, N> {
 		BeefyVersionedFinalityProof<B>,
 		ConstU32<MAX_BUFFERED_JUSTIFICATIONS>,
 	>,
+	/// Persisted voter state.
+	persisted_state: PersistedState<B>,
 	/// Chooses which incoming votes to accept and which votes to generate.
 	voting_oracle: VoterOracle<B>,
 }
@@ -385,11 +389,9 @@ where
 			on_demand_justifications,
 			links,
 			metrics,
-			best_grandpa_block_header: last_finalized_header,
-			best_beefy_block: None,
 			pending_votes: BoundedBTreeMap::new(),
 			pending_justifications: BoundedBTreeMap::new(),
-			voting_oracle: VoterOracle::new(min_block_delta),
+			persisted_state,
 		}
 	}
 
@@ -1538,7 +1540,10 @@ pub(crate) mod tests {
 		let keys = &[Keyring::Alice, Keyring::Bob];
 		let validator_set = ValidatorSet::new(make_beefy_ids(keys), 0).unwrap();
 		let mut net = BeefyTestNet::new(1);
-		let mut worker = create_beefy_worker(&net.peer(0), &keys[0], 1);
+		let mut worker = create_beefy_worker(&net.peer(0), &keys[0], 1, validator_set.clone());
+		// remove default session, will manually add custom one.
+		worker.persisted_state.voting_oracle.sessions.clear();
+
 		fn new_vote(
 			block_number: NumberFor<Block>,
 		) -> VoteMessage<NumberFor<Block>, AuthorityId, Signature> {