Merge pull request #333 from SurfingNerd/4.0-release

4.0.2 release preparation

Author: SurfingNerd

Cargo.lock

@@ -2,7 +2,7 @@
 description = "Diamond Node"
 name = "diamond-node"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "4.0.2-rc3"
+version = "4.0.2"
 license = "GPL-3.0"
 authors = [
 	"bit.diamonds developers",

Cargo.toml

@@ -415,8 +415,8 @@ impl TransactionQueue {
             .collect()
     }
 
-    /// Performs garbage collection of the pool of this transactionqueue for free service transactions.
-    /// Removes transaction that are not valid anymore.
+    /// Performs garbage collection on the pool of this `TransactionQueue` for free service transactions.
+    /// Removes transactions that are not valid anymore.
     /// The process executes listener calls.
     pub fn garbage_collect<F: Fn(&VerifiedTransaction) -> bool>(
         &self,

crates/concensus/miner/src/pool/queue.rs

@@ -306,7 +306,7 @@ pub struct Client {
 
     shutdown: Arc<ShutdownManager>,
 
-    /// block number and block has of latest gc.
+    /// block number and block hash of latest gc.
     /// this information is used to avoid double garbage collection.
     garbage_collect_latest_block: Mutex<(u64, H256)>,
 
@@ -848,11 +848,6 @@ impl Importer {
 
         client.schedule_garbage_collect_in_queue();
 
-        //self.on_block_commit_finalized();
-
-        //client.miner().g
-        //client.check_garbage();.garbage_collect(Duration::from_secs(1));
-
         route
     }
 
@@ -1582,9 +1577,9 @@ impl Client {
                 }
 
                 // here hides an accepted race condition.
-                // latest block could change during loing ongoing GCs.
+                // latest block could change during long ongoing GCs.
                 // this could be avoided developing a more complex GC logic.
-                // but the GC blocks the tx queue, so it has to be placing fast.
+                // but the GC blocks the tx queue, so it has to be blazing fast.
                 self.importer.miner.collect_garbage(|tx|
                     match machine.verify_transaction(tx.signed(), block_header, self) {
                         Ok(_) => true,

crates/ethcore/src/client/client.rs

@@ -421,7 +421,7 @@ impl Miner {
     }
 
     /// Performs garbage collection of the pool for free service transactions.
-    /// Removes transaction that are not valid anymore.
+    /// Removes transactions that are not valid anymore.
     /// The process executes listener calls.
     pub fn collect_garbage<F: Fn(&VerifiedTransaction) -> bool>(
         &self,

crates/ethcore/src/miner/miner.rs

@@ -1,7 +1,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for OpenEthereum version string (via env CARGO_PKG_VERSION)
-version = "4.0.2-rc3"
+version = "4.0.2"
 authors = [
 	"bit.diamonds developers",
 	"OpenEthereum developers",