Merge 0d7b1d0 into 717b566

.github/workflows/pr.yml

@@ -8,10 +8,7 @@ name: PR
 on: pull_request
 
 env:
-  # Run all cargo commands with --verbose.
-  CARGO_TERM_VERBOSE: true
   RUST_BACKTRACE: 1
-  # Deny all compiler warnings.
   RUSTFLAGS: "-D warnings"
 
 jobs:
@@ -30,7 +27,6 @@ jobs:
           override: true
           components: rustfmt, clippy
 
-      # Cache.
       - name: Cargo cache registry, index and build
         uses: actions/cache@v2.1.4
         with:
@@ -40,41 +36,25 @@ jobs:
             target
           key: ${{ runner.os }}-cargo-cache-${{ hashFiles('**/Cargo.lock') }}
 
-      # Check if the code is formatted correctly.
       - name: Check formatting
         run: cargo fmt --all -- --check
 
-      # Run Clippy.
       - name: Clippy checks # --feature blsttc
         run: cargo clippy --all-targets # --no-default-features --features "blsttc"
 
-  check_pr_size:
-    if: "!startsWith(github.event.pull_request.title, 'Automated version bump')"
-    name: Check PR size doesn't break set limit
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: '0'
-      - uses: maidsafe/pr_size_checker@v2
-        with:
-          max_lines_changed: 200
-
   coverage:
     if: "!startsWith(github.event.pull_request.title, 'Automated version bump')"
     name: Code coverage check
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
-      # Install Rust
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
           override: true
 
-      # Cache.
       - name: Cargo cache registry, index and build
         uses: actions/cache@v2.1.4
         with:
@@ -84,7 +64,6 @@ jobs:
             target
           key: ${{ runner.os }}-cargo-cache-${{ hashFiles('**/Cargo.lock') }}
 
-      # Run cargo tarpaulin & push result to coveralls.io
       - name: rust-tarpaulin code coverage check
         uses: actions-rs/tarpaulin@v0.1
         with:
@@ -117,7 +96,6 @@ jobs:
           toolchain: stable
           override: true
 
-      # Cache.
       - name: Cargo cache registry, index and build
         uses: actions/cache@v2.1.4
         with:
@@ -127,7 +105,6 @@ jobs:
             target
           key: ${{ runner.os }}-cargo-cache-${{ hashFiles('**/Cargo.lock') }}
 
-      # Make sure the code builds.
       - name: Run cargo build
         run: cargo build --release
 
@@ -147,7 +124,6 @@ jobs:
           toolchain: stable
           override: true
 
-      # Cache.
       - name: Cargo cache registry, index and build
         uses: actions/cache@v2.1.4
         with:
@@ -157,7 +133,6 @@ jobs:
             target
           key: ${{ runner.os }}-cargo-cache-${{ hashFiles('**/Cargo.lock') }}
 
-      # Run the tests
       - name: Run cargo test
         run: cargo test --release
 
@@ -167,7 +142,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      # Install Rust and required components
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
@@ -185,13 +159,11 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    # wget the shared deny.toml file from the QA repo
     - shell: bash
       run: wget https://raw.githubusercontent.com/maidsafe/QA/master/misc-scripts/deny.toml
 
     - uses: EmbarkStudios/cargo-deny-action@v1
 
-  # Test publish using --dry-run.
   test-publish:
     if: "!startsWith(github.event.pull_request.title, 'Automated version bump')"
     name: Test Publish

Cargo.toml

@@ -18,7 +18,7 @@ log = "0.4.13"
   features = [ "derive" ]
 
   [dependencies.blsttc]
-  version = "6.0.0"
+  version = "7.0.0"
 
   [dependencies.ed25519]
   version = "1.0.0"

src/consensus.rs

@@ -71,7 +71,7 @@ impl<T: Proposition> Consensus<T> {
             .map(|(candidate, _)| candidate.proposals.clone())
             .unwrap_or_default();
 
-        let proposals_sig_share = self.sign(&proposals)?;
+        let proposals_sig_share = Box::new(self.sign(&proposals)?);
 
         let ballot = Ballot::SuperMajority {
             votes,

src/error.rs

@@ -7,6 +7,8 @@ use crate::Generation;
 pub enum Error {
     #[error("We experienced an IO error")]
     IO(#[from] std::io::Error),
+    #[error("We experienced an formatting error")]
+    Fmt(#[from] std::fmt::Error),
     #[error("The operation requested assumes we have at least one member")]
     NoMembers,
     #[error("We can not accept any new join requests, network member size is at capacity")]

src/vote.rs

@@ -16,7 +16,7 @@ pub enum Ballot<T: Proposition> {
     Merge(BTreeSet<SignedVote<T>>),
     SuperMajority {
         votes: BTreeSet<SignedVote<T>>,
-        proposals_sig_share: SignatureShare, // signature over BTreeSet<T>
+        proposals_sig_share: Box<SignatureShare>, // signature over BTreeSet<T>
     },
 }
 

src/vote_count.rs

@@ -122,7 +122,7 @@ impl<T: Proposition> VoteCount<T> {
                 sm_count.count += 1;
                 sm_count
                     .proposals_sig_shares
-                    .insert(Fr::from(vote.voter as u64), proposals_sig_share);
+                    .insert(Fr::from(vote.voter as u64), *proposals_sig_share);
             }
 
             let c = count.candidates.entry(candidate).or_default();

tests/handover_net.rs

@@ -1,6 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet, VecDeque};
+use std::fmt::Write as FmtWrite;
 use std::fs::File;
-use std::io::Write;
+use std::io::Write as IoWrite;
 use std::iter;
 
 use blsttc::{SecretKeySet, SignatureShare};
@@ -101,7 +102,7 @@ impl Net {
 
                         Ballot::SuperMajority {
                             votes,
-                            proposals_sig_share,
+                            proposals_sig_share: Box::new(proposals_sig_share),
                         }
                     }
                 }
@@ -247,10 +248,11 @@ msc {\n
         msc.push_str(&procs);
         msc.push_str(";\n");
         for packet in self.delivered_packets.iter() {
-            msc.push_str(&format!(
-                "{:?} -> {:?} [ label=\"{:?}\"];\n",
+            write!(
+                &mut msc,
+                "{:?} -> {:?} [ label=\"{:?}\"];",
                 packet.source, packet.dest, packet.vote
-            ));
+            )?;
         }
         msc.push_str("}\n");
 

tests/membership_net.rs

@@ -1,6 +1,7 @@
 use std::collections::{BTreeMap, BTreeSet, VecDeque};
+use std::fmt::Write as FmtWrite;
 use std::fs::File;
-use std::io::Write;
+use std::io::Write as IoWrite;
 use std::iter;
 
 use blsttc::{SecretKeySet, SignatureShare};
@@ -99,7 +100,7 @@ impl Net {
 
                         Ballot::SuperMajority {
                             votes,
-                            proposals_sig_share,
+                            proposals_sig_share: Box::new(proposals_sig_share),
                         }
                     }
                 }
@@ -285,12 +286,12 @@ msc {\n
         msc.push_str(&procs);
         msc.push_str(";\n");
         for packet in self.delivered_packets.iter() {
-            msc.push_str(&format!(
-                "{:?} -> {:?} [ label=\"{:?}\"];\n",
+            write!(
+                &mut msc,
+                "{:?} -> {:?} [ label=\"{:?}\"];",
                 packet.source, packet.dest, packet.vote
-            ));
+            )?;
         }
-        msc.push_str("}\n");
 
         let mut msc_file = File::create(name)?;
         msc_file.write_all(msc.as_bytes())?;

tests/sn_membership.rs

@@ -857,7 +857,7 @@ fn test_membership_faulty_node_attempts_to_trick_honest_node() -> Result<()> {
 
     net.drain_queued_packets()?;
 
-    net.generate_msc("test_membership_faulty_node_attempts_to_trick_honest_node")?;
+    net.generate_msc("test_membership_faulty_node_attempts_to_trick_honest_node.msc")?;
 
     let honest_procs = Vec::from_iter(net.procs.iter().filter(|p| faulty != p.id()));