Rust 2021 Macro Warning Cleanup (#3658)

* small warning cleanup

* remove unused imports in tests

pool/tests/block_building.rs

@@ -18,7 +18,6 @@ use self::core::core::hash::Hashed;
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};
 use self::pool::PoolError;
-use self::util::RwLock;
 use crate::common::*;
 use grin_core as core;
 use grin_keychain as keychain;

pool/tests/block_max_weight.rs

@@ -18,7 +18,6 @@ pub mod common;
 use self::core::core::hash::Hashed;
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};
-use self::util::RwLock;
 use crate::common::*;
 use grin_core as core;
 use grin_keychain as keychain;

pool/tests/block_reconciliation.rs

@@ -17,7 +17,6 @@ pub mod common;
 use self::core::core::hash::Hashed;
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};
-use self::util::RwLock;
 use crate::common::ChainAdapter;
 use crate::common::*;
 use grin_core as core;

pool/tests/nrd_kernel_relative_height.rs

@@ -21,7 +21,6 @@ use self::core::global;
 use self::core::libtx::aggsig;
 use self::keychain::{BlindingFactor, ExtKeychain, Keychain};
 use self::pool::types::PoolError;
-use self::util::RwLock;
 use crate::common::*;
 use grin_core as core;
 use grin_keychain as keychain;

pool/tests/nrd_kernels_disabled.rs

@@ -19,7 +19,6 @@ use self::core::core::{HeaderVersion, KernelFeatures, NRDRelativeHeight};
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};
 use self::pool::types::PoolError;
-use self::util::RwLock;
 use crate::common::*;
 use grin_core as core;
 use grin_keychain as keychain;

pool/tests/nrd_kernels_enabled.rs

@@ -19,7 +19,6 @@ use self::core::core::{HeaderVersion, KernelFeatures, NRDRelativeHeight};
 use self::core::global;
 use self::keychain::{ExtKeychain, Keychain};
 use self::pool::types::PoolError;
-use self::util::RwLock;
 use crate::common::*;
 use grin_core as core;
 use grin_keychain as keychain;