Fixed warnings

Author: jgraef

blockchain-albatross/tests/history_sync.rs

@@ -6,7 +6,7 @@ use nimiq_block_albatross::{
     PbftProposal, SignedPbftCommitMessage, SignedPbftPrepareMessage,
 };
 use nimiq_block_production_albatross::BlockProducer;
-use nimiq_blockchain_albatross::{Blockchain, Direction, PushResult};
+use nimiq_blockchain_albatross::{Blockchain, PushResult};
 use nimiq_bls::{KeyPair, SecretKey};
 use nimiq_database::volatile::VolatileEnvironment;
 use nimiq_genesis::NetworkId;

blockchain-albatross/tests/mod.rs

@@ -11,7 +11,6 @@ use nimiq_block_production_albatross::BlockProducer;
 use nimiq_blockchain_albatross::{Blockchain, ForkEvent, PushError, PushResult};
 use nimiq_bls::{KeyPair, SecretKey};
 use nimiq_database::volatile::VolatileEnvironment;
-use nimiq_database::Environment;
 use nimiq_genesis::NetworkId;
 use nimiq_hash::{Blake2bHash, Hash};
 use nimiq_primitives::policy;
@@ -23,22 +22,20 @@ mod signed;
 const SECRET_KEY: &str = "196ffdb1a8acc7cbd76a251aeac0600a1d68b3aba1eba823b5e4dc5dbdcdc730afa752c05ab4f6ef8518384ad514f403c5a088a22b17bf1bc14f8ff8decc2a512c0a200f68d7bdf5a319b30356fe8d1d75ef510aed7a8660968c216c328a0000";
 
 struct TemporaryBlockProducer {
-    env: Environment,
     blockchain: Arc<Blockchain>,
     producer: BlockProducer,
 }
 
 impl TemporaryBlockProducer {
     fn new() -> Self {
         let env = VolatileEnvironment::new(10).unwrap();
-        let blockchain = Arc::new(Blockchain::new(env.clone(), NetworkId::UnitAlbatross).unwrap());
+        let blockchain = Arc::new(Blockchain::new(env, NetworkId::UnitAlbatross).unwrap());
 
         let keypair = KeyPair::from(
             SecretKey::deserialize_from_vec(&hex::decode(SECRET_KEY).unwrap()).unwrap(),
         );
         let producer = BlockProducer::new_without_mempool(Arc::clone(&blockchain), keypair);
         TemporaryBlockProducer {
-            env,
             blockchain,
             producer,
         }
@@ -253,9 +250,8 @@ fn it_cant_rebranch_across_epochs() {
     let ancestor = temp_producer1.next_block(0, vec![]);
     temp_producer2.push(ancestor.clone()).unwrap();
 
-    let mut previous = ancestor;
     for _ in 0..policy::EPOCH_LENGTH {
-        previous = temp_producer1.next_block(0, vec![]);
+        temp_producer1.next_block(0, vec![]);
     }
 
     let fork = temp_producer2.next_block(1, vec![]);

build-tools/Cargo.toml

@@ -24,7 +24,7 @@ rand = "0.7"
 rand_chacha = "0.2"
 serde = { version = "1.0", features = ["derive"] }
 shellfn = "0.1"
-simple_logger = "1.0"
+pretty_env_logger ="0.4"
 structopt = { version = "0.3", features = ["paw"] }
 toml = "0.5"
 

build-tools/src/devnet/main.rs

@@ -9,7 +9,6 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::Arc;
 
 use failure::Error;
-use log::Level;
 use structopt::StructOpt;
 
 use docker::Docker;
@@ -74,7 +73,7 @@ fn run_devnet(args: Args, keyboard_interrupt: Arc<AtomicBool>) -> Result<(), Err
 
 #[paw::main]
 fn main(args: Args) {
-    simple_logger::init_with_level(Level::Info).expect("Failed to initialize logging");
+    pretty_env_logger::init();
 
     debug!("{:#?}", args);
 

build-tools/src/genesis/main.rs

@@ -1,8 +1,6 @@
 use std::env;
 use std::process::exit;
 
-use log::Level;
-
 use nimiq_build_tools::genesis::{GenesisBuilder, GenesisInfo};
 
 fn usage(args: Vec<String>) -> ! {
@@ -14,7 +12,7 @@ fn usage(args: Vec<String>) -> ! {
 }
 
 fn main() {
-    simple_logger::init_with_level(Level::Debug).expect("Failed to initialize logging");
+    pretty_env_logger::init();
 
     let args = env::args().collect::<Vec<String>>();
 

client/src/main.rs

@@ -5,9 +5,6 @@ extern crate nimiq_lib as nimiq;
 use std::convert::TryFrom;
 use std::time::Duration;
 
-use futures::{future, FutureExt, StreamExt, TryFutureExt};
-use tokio::runtime::Runtime;
-
 use nimiq::extras::deadlock::initialize_deadlock_detection;
 use nimiq::extras::logging::{initialize_logging, log_error_cause_chain};
 use nimiq::extras::panic::initialize_panic_reporting;
@@ -77,7 +74,9 @@ async fn main_inner() -> Result<(), Error> {
                     pkcs12_key_file.display()
                 )
             });
-            let metrics_server = initialize_metrics_server(
+
+            // FIXME: Spawn `metrics_server` (which is a IntoFuture)
+            let _metrics_server = initialize_metrics_server(
                 &client,
                 metrics_config,
                 pkcs12_key_file,
@@ -120,8 +119,6 @@ async fn main_inner() -> Result<(), Error> {
             );
         }
     }
-
-    Ok(())
 }
 
 #[tokio::main]

consensus-albatross/src/consensus/mod.rs

@@ -22,7 +22,6 @@ use network_interface::{
 };
 use transaction::Transaction;
 use utils::mutable_once::MutableOnce;
-use utils::timers::Timers;
 
 use crate::consensus_agent::ConsensusAgent;
 use crate::error::{Error, SyncError};
@@ -59,7 +58,7 @@ pub struct Consensus<N: Network> {
     pub network: Arc<N>,
     pub env: Environment,
 
-    timers: Timers<ConsensusTimer>,
+    //timers: Timers<ConsensusTimer>,
 
     pub(crate) state: RwLock<ConsensusState<N>>,
 
@@ -69,10 +68,10 @@ pub struct Consensus<N: Network> {
     sync_protocol: Box<dyn SyncProtocol<N>>,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+/*#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 enum ConsensusTimer {
     Sync,
-}
+}*/
 
 type ConsensusAgentMap<P> = HashMap<Arc<P>, Arc<ConsensusAgent<P>>>;
 
@@ -98,7 +97,7 @@ impl<N: Network> Consensus<N> {
             network,
             env,
 
-            timers: Timers::new(),
+            //timers: Timers::new(),
 
             state: RwLock::new(ConsensusState {
                 agents: HashMap::new(),
@@ -172,7 +171,7 @@ impl<N: Network> Consensus<N> {
         let agent = Arc::new(ConsensusAgent::new(Arc::clone(&peer)));
         self.state.write().agents.insert(peer, Arc::clone(&agent));
 
-        self.events.send(ConsensusEvent::PeerJoined(agent));
+        self.events.send(ConsensusEvent::PeerJoined(agent)).unwrap_or_else(|_| panic!(""));
     }
 
     fn on_peer_left(&self, peer: Arc<N::PeerType>) {

consensus-albatross/src/consensus/request_response.rs

@@ -4,16 +4,14 @@ use futures::StreamExt;
 
 use crate::messages::handlers::Handle;
 use crate::messages::{
-    BlockHashes, Epoch, RequestBlockHashes, RequestBlockHashesFilter, RequestEpoch,
+    RequestBlockHashes, RequestEpoch,
     RequestHistoryChunk,
 };
 use crate::Consensus;
 
-use block_albatross::Block;
-use blockchain_albatross::{Blockchain, Direction};
-use network_interface::prelude::{Network, Peer, ResponseMessage};
-use nimiq_genesis::NetworkInfo;
-use primitives::policy;
+use blockchain_albatross::Blockchain;
+use network_interface::prelude::{Network, Peer};
+
 
 impl<N: Network> Consensus<N> {
     pub(super) fn init_network_requests(network: &Arc<N>, blockchain: &Arc<Blockchain>) {

consensus-albatross/src/lib.rs

@@ -1,3 +1,5 @@
+#![allow(dead_code)]
+
 #[macro_use]
 extern crate beserial_derive;
 #[macro_use]

consensus-albatross/src/messages/mod.rs

@@ -5,7 +5,6 @@ use failure::_core::fmt::{Error, Formatter};
 use hash::Blake2bHash;
 use network_interface::message::*;
 use std::fmt::Debug;
-use transaction::Transaction;
 
 use crate::request_response;
 
@@ -134,7 +133,7 @@ impl Message for HistoryChunk {
 }
 
 impl Debug for HistoryChunk {
-    fn fmt(&self, f: &mut Formatter<'_>) -> Result<(), Error> {
+    fn fmt(&self, _f: &mut Formatter<'_>) -> Result<(), Error> {
         unimplemented!()
     }
 }