Merge pull request DMDcoin#227 from DMDcoin/0.11

beta update for 0.11.1 changes

Author: SurfingNerd

.github/workflows/check.yml

@@ -21,17 +21,12 @@ jobs:
           toolchain:            1.85
           profile:              minimal
           override:             true
-      - name:                   Run cargo check 1/3
+      - name:                   Run cargo check
         uses:                   actions-rs/cargo@v1
         with:
           command:              check
-          args:                 --locked --no-default-features --verbose
-      - name:                   Run cargo check 2/3
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked --manifest-path crates/runtime/io/Cargo.toml --no-default-features --verbose
-      - name:                   Run cargo check 3/3
+          args:                 --locked --all --benches --verbose --tests
+      - name:                   Run cargo check mio io
         uses:                   actions-rs/cargo@v1
         with:
           command:              check
@@ -41,10 +36,7 @@ jobs:
         with:
           command:              check
           args:                 --locked -p evmbin --verbose
-      - name:                   Run cargo check benches
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked --all --benches --verbose
       - name:                   Run validate chainspecs
         run:                    ./scripts/actions/validate-chainspecs.sh
+          args:                 --locked --all --benches --verbose --tests
+

bin/ethstore/src/main.rs

@@ -17,7 +17,6 @@
 extern crate dir;
 extern crate docopt;
 extern crate ethstore;
-use num_cpus;
 extern crate panic_hook;
 extern crate parking_lot;
 extern crate rustc_hex;

bin/evmbin/src/display/std_json.rs

@@ -26,27 +26,18 @@ use ethereum_types::{BigEndianHash, H256, U256};
 
 pub trait Writer: io::Write + Send + Sized {
     fn clone(&self) -> Self;
-    fn default() -> Self;
 }
 
 impl Writer for io::Stdout {
     fn clone(&self) -> Self {
         io::stdout()
     }
-
-    fn default() -> Self {
-        io::stdout()
-    }
 }
 
 impl Writer for io::Stderr {
     fn clone(&self) -> Self {
         io::stderr()
     }
-
-    fn default() -> Self {
-        io::stderr()
-    }
 }
 
 /// JSON formatting informant.
@@ -299,9 +290,6 @@ pub mod tests {
         fn clone(&self) -> Self {
             Clone::clone(self)
         }
-        fn default() -> Self {
-            Default::default()
-        }
     }
 
     impl io::Write for TestWriter {

bin/evmbin/src/main.rs

@@ -336,7 +336,6 @@ fn run_call<T: Informant>(args: Args, informant: T) {
 
 #[derive(Debug, Deserialize)]
 struct Args {
-    cmd_stats: bool,
     cmd_state_test: bool,
     cmd_stats_jsontests_vm: bool,
     arg_file: Option<PathBuf>,

bin/oe/rpc_apis.rs

@@ -214,6 +214,7 @@ pub struct FullDependencies {
     pub client: Arc<Client>,
     pub snapshot: Arc<dyn SnapshotService>,
     pub sync: Arc<dyn SyncProvider>,
+    #[allow(dead_code)]
     pub net: Arc<dyn ManageNetwork>,
     pub accounts: Arc<AccountProvider>,
     pub miner: Arc<Miner>,

bin/oe/secretstore.rs

@@ -87,6 +87,9 @@ pub struct Configuration {
 }
 
 /// Secret store dependencies
+/// TODO: The compiler complains that none of the struct members are ever used
+/// Remove this struct and all its dependencies
+#[allow(dead_code)]
 pub struct Dependencies<'a> {
     /// Blockchain client.
     pub client: Arc<Client>,

bin/oe/signer.rs

@@ -26,7 +26,6 @@ use ethcore_logger::Config as LogConfig;
 pub const CODES_FILENAME: &str = "authcodes";
 
 pub struct NewToken {
-    pub token: String,
     pub message: String,
 }
 
@@ -69,7 +68,6 @@ pub fn generate_token_and_url(
     };
 
     Ok(NewToken {
-        token: code.clone(),
         message: format!(
             r#"
 Generated token:

crates/concensus/ethash/src/shared.rs

@@ -70,10 +70,6 @@ pub type NodeBytes = [u8; NODE_BYTES];
 pub type NodeWords = [u32; NODE_WORDS];
 pub type NodeDwords = [u64; NODE_DWORDS];
 
-unsafe trait AsBigAsUsize: Sized {
-    const _DUMMY: [(); 0];
-}
-
 macro_rules! static_assert_size_eq {
 	(@inner $a:ty, $b:ty, $($rest:ty),*) => {
 		fn first() {
@@ -85,11 +81,11 @@ macro_rules! static_assert_size_eq {
 		}
 	};
 	(@inner $a:ty, $b:ty) => {
-        unsafe impl AsBigAsUsize for $a {
-            #[allow(dead_code)]
-            const _DUMMY: [(); 0] =
-                [(); (::std::mem::size_of::<$a>() - ::std::mem::size_of::<$b>())];
-        }
+        // Use const assertion instead of trait implementation
+        const _: () = assert!(
+            ::std::mem::size_of::<$a>() == ::std::mem::size_of::<$b>(),
+            concat!("Size mismatch between ", stringify!($a), " and ", stringify!($b))
+        );
 	};
 	($($rest:ty),*) => {
 		static_assert_size_eq!(size_eq: $($rest),*);

crates/db/memory-db/benches/bench.rs

@@ -44,7 +44,7 @@ fn instantiation(b: &mut Criterion) {
 fn compare_to_null_embedded_in_struct(b: &mut Criterion) {
     struct X {
         a_hash: <KeccakHasher as Hasher>::Out,
-    };
+    }
     let x = X {
         a_hash: KeccakHasher::hash(&[0u8][..]),
     };

crates/ethcore/blockchain/src/blockchain.rs

@@ -1573,7 +1573,7 @@ impl BlockChain {
     }
 
     /// Iterator that lists `first` and then all of `first`'s ancestors, by extended header.
-    pub fn ancestry_with_metadata_iter<'a>(&'a self, first: H256) -> AncestryWithMetadataIter {
+    pub fn ancestry_with_metadata_iter<'a>(&'a self, first: H256) -> AncestryWithMetadataIter<'a> {
         AncestryWithMetadataIter {
             current: if self.is_known(&first) {
                 first