Merge pull request #80 from SurfingNerd/sn/rust-upgrade

Multithreading for hbbft message analysis and logging

.github/workflows/build-test-windows.yml

@@ -13,7 +13,7 @@ jobs:
         platform:
           - windows2019 # custom runner
         toolchain:
-          - 1.52.1
+          - latest
     runs-on:                    ${{ matrix.platform }}
     steps:
       - name:                   Checkout sources

.github/workflows/build-test.yml

@@ -15,7 +15,7 @@ jobs:
           - ubuntu-16.04
           - macos-latest
         toolchain:
-          -  1.52.1
+          -  latest
     runs-on:                    ${{ matrix.platform }}
     steps:
       - name:                   Checkout sources

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
           - ubuntu-16.04
           - macos-latest
         toolchain:
-          - 1.52.1
+          - latest
     runs-on:                    ${{ matrix.platform }}
     steps:
       - name:                   Checkout sources

.github/workflows/check.yml

@@ -9,16 +9,16 @@ on:
 jobs:
   check:
     name:                       Check
-    runs-on:                    ubuntu-16.04
+    runs-on:                    ubuntu-20.04
     steps:
       - name:                   Checkout sources
         uses:                   actions/checkout@main
         with:
           submodules:           true
-      - name:                   Install 1.52.1 toolchain
+      - name:                   Install 1.59 toolchain
         uses:                   actions-rs/toolchain@v1
         with:
-          toolchain:            1.52.1
+          toolchain:            1.59
           profile:              minimal
           override:             true
       - name:                   Run cargo check 1/3

.github/workflows/deploy-docker-nightly.yml

@@ -16,7 +16,7 @@ jobs:
       - name:                   Install toolchain
         uses:                   actions-rs/toolchain@v1
         with:
-          toolchain:            1.52.1
+          toolchain:            latest
           profile:              minimal
           override:             true
       - name:                   Deploy to docker hub

.github/workflows/deploy-docker-tag.yml

@@ -17,7 +17,7 @@ jobs:
       - name:                   Install toolchain
         uses:                   actions-rs/toolchain@v1
         with:
-          toolchain:            1.52.1
+          toolchain:            latest
           profile:              minimal
           override:             true
       - name:                   Deploy to docker hub

.github/workflows/fmt.yml

@@ -5,13 +5,13 @@ name: rustfmt
 jobs:
   fmt:
     name: Rustfmt
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: 1.52.1
+          toolchain: 1.59
           override: true
       - run: rustup component add rustfmt
       - uses: actions-rs/cargo@v1

bin/oe/cli/usage.rs

@@ -18,9 +18,7 @@ macro_rules! return_if_parse_error {
     ($e:expr) => {
         match $e {
             Err(
-                clap_error
-                @
-                ClapError {
+                clap_error @ ClapError {
                     kind: ClapErrorKind::ValueValidation,
                     ..
                 },

bin/oe/informant.rs

@@ -354,9 +354,7 @@ impl ChainNotify for Informant<FullNodeInformantData> {
         if new_blocks.has_more_blocks_to_import {
             return;
         }
-        info!(target: "import", "Informant: trying to get lock.");
         let mut last_import = self.last_import.lock();
-        info!(target: "import", "Informant: got lock.");
         let client = &self.target.client;
 
         let importing = self.target.is_major_importing();

crates/concensus/miner/src/local_accounts.rs

@@ -23,7 +23,7 @@ use ethereum_types::Address;
 /// Local accounts checker
 pub trait LocalAccounts: Send + Sync {
     /// Returns true if given address should be considered local account.
-    fn is_local(&self, &Address) -> bool;
+    fn is_local(&self, address: &Address) -> bool;
 }
 
 impl LocalAccounts for HashSet<Address> {

crates/ethcore/src/engines/hbbft/hbbft_engine.rs

@@ -48,7 +48,7 @@ use engines::hbbft::{
     contracts::validator_set::{
         get_validator_available_since, send_tx_announce_availability, staking_by_mining_address,
     },
-    hbbft_message_memorium::HbbftMessageMemorium,
+    hbbft_message_memorium::HbbftMessageDispatcher,
 };
 use std::{ops::Deref, sync::atomic::Ordering};
 
@@ -70,7 +70,7 @@ pub struct HoneyBadgerBFT {
     signer: Arc<RwLock<Option<Box<dyn EngineSigner>>>>,
     machine: EthereumMachine,
     hbbft_state: RwLock<HbbftState>,
-    hbbft_message_memorial: RwLock<HbbftMessageMemorium>,
+    hbbft_message_dispatcher: RwLock<HbbftMessageDispatcher>,
     sealing: RwLock<BTreeMap<BlockNumber, Sealing>>,
     params: HbbftParams,
     message_counter: RwLock<usize>,
@@ -210,7 +210,7 @@ impl HoneyBadgerBFT {
             signer: Arc::new(RwLock::new(None)),
             machine,
             hbbft_state: RwLock::new(HbbftState::new()),
-            hbbft_message_memorial: RwLock::new(HbbftMessageMemorium::new()),
+            hbbft_message_dispatcher: RwLock::new(HbbftMessageDispatcher::new()),
             sealing: RwLock::new(BTreeMap::new()),
             params,
             message_counter: RwLock::new(0),
@@ -332,7 +332,7 @@ impl HoneyBadgerBFT {
         trace!(target: "consensus", "Received message of idx {}  {:?} from {}", msg_idx, message, sender_id);
 
         // store received messages here.
-        self.hbbft_message_memorial
+        self.hbbft_message_dispatcher
             .write()
             .on_message_received(&message);
 
@@ -357,7 +357,7 @@ impl HoneyBadgerBFT {
         block_num: BlockNumber,
     ) -> Result<(), EngineError> {
         // store received messages here.
-        self.hbbft_message_memorial
+        self.hbbft_message_dispatcher
             .write()
             .on_sealing_message_received(&message, block_num);
 
@@ -966,7 +966,7 @@ impl Engine<EthereumMachine> for HoneyBadgerBFT {
             }
         }
 
-        self.hbbft_message_memorial
+        self.hbbft_message_dispatcher
             .write()
             .free_memory(block.header.number());