Rename TestConsensus to TestContext

Code/test/src/consensus.rs → Code/test/src/context.rs

@@ -10,9 +10,9 @@ use crate::value::*;
 use crate::vote::*;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
-pub struct TestConsensus;
+pub struct TestContext;
 
-impl Context for TestConsensus {
+impl Context for TestContext {
     type Address = Address;
     type Height = Height;
     type Proposal = Proposal;

Code/test/src/lib.rs

@@ -1,15 +1,15 @@
 #![forbid(unsafe_code)]
 #![deny(trivial_casts, trivial_numeric_casts)]
 
-mod consensus;
+mod context;
 mod height;
 mod proposal;
 mod signing;
 mod validator_set;
 mod value;
 mod vote;
 
-pub use crate::consensus::*;
+pub use crate::context::*;
 pub use crate::height::*;
 pub use crate::proposal::*;
 pub use crate::signing::*;

Code/test/src/proposal.rs

@@ -1,6 +1,6 @@
 use malachite_common::Round;
 
-use crate::{Height, TestConsensus, Value};
+use crate::{Height, TestContext, Value};
 
 /// A proposal for a value in a round
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -22,7 +22,7 @@ impl Proposal {
     }
 }
 
-impl malachite_common::Proposal<TestConsensus> for Proposal {
+impl malachite_common::Proposal<TestContext> for Proposal {
     fn height(&self) -> Height {
         self.height
     }

Code/test/src/validator_set.rs

@@ -2,7 +2,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
 
 use malachite_common::VotingPower;
 
-use crate::{signing::PublicKey, TestConsensus};
+use crate::{signing::PublicKey, TestContext};
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
 pub struct Address([u8; Self::LENGTH]);
@@ -42,7 +42,7 @@ impl Validator {
     }
 }
 
-impl malachite_common::Validator<TestConsensus> for Validator {
+impl malachite_common::Validator<TestContext> for Validator {
     fn address(&self) -> &Address {
         &self.address
     }
@@ -142,7 +142,7 @@ impl ValidatorSet {
     }
 }
 
-impl malachite_common::ValidatorSet<TestConsensus> for ValidatorSet {
+impl malachite_common::ValidatorSet<TestContext> for ValidatorSet {
     fn total_voting_power(&self) -> VotingPower {
         self.total_voting_power()
     }

Code/test/src/vote.rs

@@ -2,7 +2,7 @@ use signature::Signer;
 
 use malachite_common::{Round, SignedVote, VoteType};
 
-use crate::{Address, PrivateKey, TestConsensus, ValueId};
+use crate::{Address, PrivateKey, TestContext, ValueId};
 
 /// A vote for a value in a round
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -50,7 +50,7 @@ impl Vote {
         bytes
     }
 
-    pub fn signed(self, private_key: &PrivateKey) -> SignedVote<TestConsensus> {
+    pub fn signed(self, private_key: &PrivateKey) -> SignedVote<TestContext> {
         let signature = private_key.sign(&self.to_bytes());
 
         SignedVote {
@@ -60,7 +60,7 @@ impl Vote {
     }
 }
 
-impl malachite_common::Vote<TestConsensus> for Vote {
+impl malachite_common::Vote<TestContext> for Vote {
     fn round(&self) -> Round {
         self.round
     }

Code/test/tests/consensus_executor.rs

@@ -3,19 +3,19 @@ use malachite_consensus::executor::{Event, Executor, Message};
 use malachite_round::state::{RoundValue, State, Step};
 
 use malachite_test::{
-    Address, Height, PrivateKey, Proposal, TestConsensus, Validator, ValidatorSet, Vote,
+    Address, Height, PrivateKey, Proposal, TestContext, Validator, ValidatorSet, Vote,
 };
 use rand::rngs::StdRng;
 use rand::SeedableRng;
 
 struct TestStep {
     desc: &'static str,
-    input_event: Option<Event<TestConsensus>>,
-    expected_output: Option<Message<TestConsensus>>,
-    new_state: State<TestConsensus>,
+    input_event: Option<Event<TestContext>>,
+    expected_output: Option<Message<TestContext>>,
+    new_state: State<TestContext>,
 }
 
-fn to_input_msg(output: Message<TestConsensus>) -> Option<Event<TestConsensus>> {
+fn to_input_msg(output: Message<TestContext>) -> Option<Event<TestContext>> {
     match output {
         Message::Propose(p) => Some(Event::Proposal(p)),
         Message::Vote(v) => Some(Event::Vote(v)),
@@ -26,7 +26,7 @@ fn to_input_msg(output: Message<TestConsensus>) -> Option<Event<TestConsensus>>
 
 #[test]
 fn executor_steps_proposer() {
-    let value = TestConsensus::DUMMY_VALUE; // TODO: get value from external source
+    let value = TestContext::DUMMY_VALUE; // TODO: get value from external source
     let value_id = value.id();
 
     let mut rng = StdRng::seed_from_u64(0x42);
@@ -207,7 +207,7 @@ fn executor_steps_proposer() {
 
 #[test]
 fn executor_steps_not_proposer() {
-    let value = TestConsensus::DUMMY_VALUE; // TODO: get value from external source
+    let value = TestContext::DUMMY_VALUE; // TODO: get value from external source
     let value_id = value.id();
 
     let mut rng = StdRng::seed_from_u64(0x42);
@@ -388,7 +388,7 @@ fn executor_steps_not_proposer() {
 
 #[test]
 fn executor_steps_not_proposer_timeout() {
-    let value = TestConsensus::DUMMY_VALUE; // TODO: get value from external source
+    let value = TestContext::DUMMY_VALUE; // TODO: get value from external source
     let value_id = value.id();
 
     let mut rng = StdRng::seed_from_u64(0x42);

Code/test/tests/round.rs

@@ -1,4 +1,4 @@
-use malachite_test::{Address, Height, Proposal, TestConsensus, Value};
+use malachite_test::{Address, Height, Proposal, TestContext, Value};
 
 use malachite_common::{Round, Timeout, TimeoutStep};
 use malachite_round::events::Event;
@@ -13,7 +13,7 @@ fn test_propose() {
     let value = Value::new(42);
     let height = Height::new(10);
 
-    let mut state: State<TestConsensus> = State::default();
+    let mut state: State<TestContext> = State::default();
     let data = RoundData::new(Round::new(0), &height, &ADDRESS);
 
     let transition = apply_event(state.clone(), &data, Event::NewRoundProposer(value));
@@ -32,7 +32,7 @@ fn test_prevote() {
     let value = Value::new(42);
     let height = Height::new(1);
 
-    let state: State<TestConsensus> = State::default().new_round(Round::new(1));
+    let state: State<TestContext> = State::default().new_round(Round::new(1));
     let data = RoundData::new(Round::new(1), &height, &ADDRESS);
 
     let transition = apply_event(state, &data, Event::NewRound);

Code/test/tests/round_votes.rs

@@ -2,15 +2,15 @@ use malachite_common::Round;
 use malachite_vote::count::Threshold;
 use malachite_vote::RoundVotes;
 
-use malachite_test::{Address, Height, TestConsensus, ValueId, Vote};
+use malachite_test::{Address, Height, TestContext, ValueId, Vote};
 
 const ADDRESS: Address = Address::new([42; 20]);
 
 #[test]
 fn add_votes_nil() {
     let total = 3;
 
-    let mut round_votes: RoundVotes<TestConsensus> =
+    let mut round_votes: RoundVotes<TestContext> =
         RoundVotes::new(Height::new(1), Round::new(0), total);
 
     // add a vote for nil. nothing changes.
@@ -34,7 +34,7 @@ fn add_votes_single_value() {
     let total = 4;
     let weight = 1;
 
-    let mut round_votes: RoundVotes<TestConsensus> =
+    let mut round_votes: RoundVotes<TestContext> =
         RoundVotes::new(Height::new(1), Round::new(0), total);
 
     // add a vote. nothing changes.
@@ -64,7 +64,7 @@ fn add_votes_multi_values() {
     let val2 = Some(v2);
     let total = 15;
 
-    let mut round_votes: RoundVotes<TestConsensus> =
+    let mut round_votes: RoundVotes<TestContext> =
         RoundVotes::new(Height::new(1), Round::new(0), total);
 
     // add a vote for v1. nothing changes.

Code/test/tests/vote_keeper.rs

@@ -1,13 +1,13 @@
 use malachite_common::Round;
 use malachite_vote::keeper::{Message, VoteKeeper};
 
-use malachite_test::{Address, Height, TestConsensus, ValueId, Vote};
+use malachite_test::{Address, Height, TestContext, ValueId, Vote};
 
 const ADDRESS: Address = Address::new([42; 20]);
 
 #[test]
 fn prevote_apply_nil() {
-    let mut keeper: VoteKeeper<TestConsensus> = VoteKeeper::new(Height::new(1), Round::INITIAL, 3);
+    let mut keeper: VoteKeeper<TestContext> = VoteKeeper::new(Height::new(1), Round::INITIAL, 3);
 
     let vote = Vote::new_prevote(Round::new(0), None, ADDRESS);
 
@@ -23,7 +23,7 @@ fn prevote_apply_nil() {
 
 #[test]
 fn precommit_apply_nil() {
-    let mut keeper: VoteKeeper<TestConsensus> = VoteKeeper::new(Height::new(1), Round::INITIAL, 3);
+    let mut keeper: VoteKeeper<TestContext> = VoteKeeper::new(Height::new(1), Round::INITIAL, 3);
 
     let vote = Vote::new_precommit(Round::new(0), None, ADDRESS);
 
@@ -39,7 +39,7 @@ fn precommit_apply_nil() {
 
 #[test]
 fn prevote_apply_single_value() {
-    let mut keeper: VoteKeeper<TestConsensus> = VoteKeeper::new(Height::new(1), Round::INITIAL, 4);
+    let mut keeper: VoteKeeper<TestContext> = VoteKeeper::new(Height::new(1), Round::INITIAL, 4);
 
     let v = ValueId::new(1);
     let val = Some(v);
@@ -61,7 +61,7 @@ fn prevote_apply_single_value() {
 
 #[test]
 fn precommit_apply_single_value() {
-    let mut keeper: VoteKeeper<TestConsensus> = VoteKeeper::new(Height::new(1), Round::INITIAL, 4);
+    let mut keeper: VoteKeeper<TestContext> = VoteKeeper::new(Height::new(1), Round::INITIAL, 4);
 
     let v = ValueId::new(1);
     let val = Some(v);