Skip to content

Commit

Permalink
node: Fix clippy warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
goshawk committed Dec 5, 2023
1 parent bb27a00 commit 7e6a39e
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 35 deletions.
14 changes: 4 additions & 10 deletions node/src/chain.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@ use tracing::{error, info, warn};

use async_trait::async_trait;

use dusk_consensus::commons::{ConsensusError, Database, RoundUpdate};
use dusk_consensus::consensus::Consensus;
use dusk_consensus::contract_state::{
CallParams, Error, Operations, Output, StateRoot,
};
use dusk_consensus::user::provisioners::Provisioners;
use node_data::ledger::{self, to_str, Block, Hash, Header, Label};
use node_data::ledger::{to_str, Block, Label};

use node_data::message::AsyncQueue;
use node_data::message::{Payload, Topics};
Expand Down Expand Up @@ -76,7 +70,7 @@ impl<N: Network, DB: database::DB, VM: vm::VMExecution>
.await?;

// Restore/Load most recent block
let (mrb) = Self::load_most_recent_block(db.clone()).await?;
let mrb = Self::load_most_recent_block(db.clone()).await?;

let provisioners_list = vm.read().await.get_provisioners()?;

Expand Down Expand Up @@ -229,9 +223,9 @@ impl ChainSrv {
// either malformed or empty.
let genesis_blk = genesis::generate_state();

/// Persist genesis block
// Persist genesis block
t.store_block(genesis_blk.header(), &[], Label::Final)?;

genesis_blk
}
};
Expand Down
5 changes: 2 additions & 3 deletions node/src/chain/acceptor.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use dusk_consensus::user::committee::{Committee, CommitteeSet};
use dusk_consensus::user::provisioners::Provisioners;
use dusk_consensus::user::sortition;
use node_data::ledger::{
self, to_str, Block, BlockWithLabel, Hash, Header, Label, Seed, Signature,
self, to_str, Block, BlockWithLabel, Label, Seed, Signature,
SpentTransaction,
};
use node_data::message::AsyncQueue;
Expand Down Expand Up @@ -69,8 +69,7 @@ impl<DB: database::DB, VM: vm::VMExecution, N: Network> Acceptor<N, DB, VM> {
network: Arc<RwLock<N>>,
vm: Arc<RwLock<VM>>,
) -> Self {

let acc = Self {
let acc = Self {
mrb: RwLock::new(BlockWithLabel::new_with_label(
mrb.clone(),
Label::Accepted, // TODO: Load this from DB
Expand Down
3 changes: 1 addition & 2 deletions node/src/chain/fsm.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ use crate::chain::fallback;
use crate::database;
use crate::{vm, Network};

use dusk_consensus::user::provisioners::{self, Provisioners};
use node_data::ledger::{self, to_str, Block, Hash, Label, Transaction};
use node_data::ledger::{to_str, Block, Label};
use node_data::message::payload::GetBlocks;
use node_data::message::Message;
use std::collections::{HashMap, HashSet};
Expand Down
29 changes: 13 additions & 16 deletions node/src/database/rocksdb.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
use super::{Candidate, Ledger, Persist, Register, DB};
use anyhow::Result;


use node_data::encoding::*;
use node_data::ledger::{self, Label, SpentTransaction};
use node_data::Serializable;

Expand Down Expand Up @@ -409,7 +407,8 @@ impl<'db, DB: DBAccess> Ledger for DBTransaction<'db, DB> {
Ok(self
.snapshot
.get_cf(self.ledger_height_cf, height.to_le_bytes())?
.iter().find(|v| v.len() == LEN)
.iter()
.find(|v| v.len() == LEN)
.map(|h| Label::from(h[LEN - 1])))
}
}
Expand Down Expand Up @@ -739,13 +738,12 @@ impl node_data::Serializable for HeaderRecord {
#[cfg(test)]
mod tests {
use super::*;
use hex::ToHex;

use node_data::ledger;

use fake::{Dummy, Fake, Faker};
use fake::{Fake, Faker};
use node_data::ledger::Transaction;
use rand::prelude::*;
use rand::Rng;

#[test]
fn test_store_block() {
Expand Down Expand Up @@ -778,7 +776,7 @@ mod tests {

// Assert all transactions are fully fetched from ledger as
// well.
for pos in (0..b.txs().len()) {
for pos in 0..b.txs().len() {
assert_eq!(db_blk.txs()[pos].hash(), b.txs()[pos].hash());
}
});
Expand Down Expand Up @@ -904,9 +902,9 @@ mod tests {
TestWrapper::new("test_mempool_txs_sorted_by_fee").run(|path| {
let db: Backend = Backend::create_or_open(path);
// Populate mempool with N contract calls
let mut rng = rand::thread_rng();
let _rng = rand::thread_rng();
db.update(|txn| {
for i in 0..10u32 {
for _i in 0..10u32 {
let t: ledger::Transaction = Faker.fake();
txn.add_tx(&t)?;
}
Expand Down Expand Up @@ -972,7 +970,7 @@ mod tests {
fn test_get_ledger_tx_by_hash() {
TestWrapper::new("test_get_ledger_tx_by_hash").run(|path| {
let db: Backend = Backend::create_or_open(path);
let mut b: ledger::Block = Faker.fake();
let b: ledger::Block = Faker.fake();
assert!(!b.txs().is_empty());

// Store a block
Expand Down Expand Up @@ -1006,7 +1004,7 @@ mod tests {
fn test_fetch_block_hash_by_height() {
TestWrapper::new("test_fetch_block_hash_by_height").run(|path| {
let db: Backend = Backend::create_or_open(path);
let mut b: ledger::Block = Faker.fake();
let b: ledger::Block = Faker.fake();

// Store a block
assert!(db
Expand Down Expand Up @@ -1035,7 +1033,7 @@ mod tests {
fn test_fetch_block_label_by_height() {
TestWrapper::new("test_fetch_block_hash_by_height").run(|path| {
let db: Backend = Backend::create_or_open(path);
let mut b: ledger::Block = Faker.fake();
let b: ledger::Block = Faker.fake();

// Store a block
assert!(db
Expand Down Expand Up @@ -1066,7 +1064,7 @@ mod tests {
let t = TestWrapper::new("test_fetch_block_hash_by_height");
t.run(|path| {
let db: Backend = Backend::create_or_open(path);
let mut b: ledger::Block = Faker.fake();
let b: ledger::Block = Faker.fake();

assert!(db
.update(|ut| {
Expand All @@ -1088,7 +1086,7 @@ mod tests {
});

let path = t.get_path();
let mut opts = Options::default();
let opts = Options::default();

// Iterate through all items, in all CFs.
// Ensure that the only key available after deleting a block is
Expand All @@ -1097,8 +1095,7 @@ mod tests {
let vec = rocksdb_lib::DB::list_cf(&opts, &path).unwrap();
assert!(!vec.is_empty());

let mut db =
rocksdb_lib::DB::open_cf(&opts, &path, vec.clone()).unwrap();
let db = rocksdb_lib::DB::open_cf(&opts, &path, vec.clone()).unwrap();

vec.into_iter()
.map(|cf_name| {
Expand Down
4 changes: 1 addition & 3 deletions node/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,4 @@ impl<N: Network, DB: database::DB, VM: vm::VMExecution> Node<N, DB, VM> {
}

#[cfg(test)]
mod tests {
use super::*;
}
mod tests {}
2 changes: 1 addition & 1 deletion node/src/network/frame.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,6 @@ mod tests {
fn test_block() {
let hexdata = "6e0a00000000000000000000010000008c773cfffede68e79ebbe2670b00f6060000000000008424946400000000f0b411c188b40c1196fe3621c4793ee5164dc6c2e20ece8a8c6aa1dfe6678a0430910a12a8ba0eace1d12063b9dbfd5e18d78fcc06a0ed59b952ac143b29186b189e8d4bfc3dc0aa43a7522bc61cec5150b4b1edd86ef27da5a7215c2671022acb9284c2c81230625172513d8070d3df5baf66903d83ed01c6bb809c6255fdf806e21a44e11070dd90bffc32f30a9010616906260757181552d2cd1f317a9d6cc803ddf71c76fb8e1357b62b659a2bae5617daebae1f5bc467cb1e6c34496f8bfc839515cdd712bb83509d3b4ff821b9850b1098da050ad3eb61fd65384aadf17a8c511051b202d8aff24ede98d09a0d6b005ed0b2000000000130b7a60a49581b53ae17ef7adf5a06beb499e49f757ceaf1d172c6063ea9297361368ea3326df36eb09e85bab0a07083b530a03365463092c008e08929031b9f5c13309ce306f38d3cc93eda62af95aced173a6f352e258c54ff5a98be9df15345281d000000000000001d000000000000006538724fa461839a2b1a3570e8823cbe9fc57140a02af1b7921ca267cf87f90b010100000001000000af08000031858df61df8a7208b64540f1dafffcce0ec7613f38d6147ca4393c101d45e600200000000000000f1afb77f1551f559f1226f88b2efbbc37c811218cc50531f0a8a704c98c35a32e1b905bb45a09cbca4e003a9f9d2eb6c16adf6fa49ca8afd8dfdfca449f354700100000000000000017918bbfc50c9a07b4abf98e605085f543cca07ca802b94afe1d992995543335a2d6307d9dc46929cb072d09bc790b6214671fc55df8e8d7af1bb3ef33529d31dce2982d5fef7fd0f7e36ba3e88d119fb807a546f3e273d09380dbdf48d0c57f0513c03a5c1e98e40493acde840d384c965bfccdb26af78aec81333fe24028fc2ffffffffffffffffe2f34d13ef74e08d966ced4a75ea36af891247031f848b003755dff9e8060b01104e6237b437d401ba7ad37a2435fbcb39ad17e3308a0a80c97acbe336e68851d034589b1859998aeced6f060874daf17299ae5cba212020f6bb80701afb1f410065cd1d000000000100000000000000d870bd7510b7d51655ce1122829ec083b7d0a5a4db2ffe16589b3eabaec51d0f7a600e3dae06a4f740336cedd2b5bbeaf50428fbee075bd29cef630bab5f86a9001004000000000000a0f630636f64629f0a4422b00d5dbccb0405c4124603b4f00b29ef1ab49a617bacda7c6ea142a7ca80b1817f072a0c8491a6966f8b648c6e552b4afaa4fc5d1867448d1e3a1a360cccb68d54f100e47ab0a98464e8e8bbcca13c057ea89bb0f1b1aedd1ed10e18b5661f2dd029ecb7060110cd784837675c5588cbc5721b9075eb9b6c6a1dacff8fd9ae5e2587994f0e8b74ecc9cd9254916dcb7518d807d452ba551a5590d3045283739f8f954d3550ae08717f717bcff71a8c87d3725135abb0e1cf62b16d3e0185d589f2c84f04b577ec154ab770719eec1b3e935736021a49dbfdbd0fc76e12d33d516e3ab187b680b5a42b6f9d8104699a0e5d440db122698bbc0e7d7907d32d73664b88a4efe650bcd2cd8e17b6e1060fb99e0ba7cea790bae9e87f920bd37bb5d95946e679150560659f037cc148780745b21a8f8f726a82ec597f8195622fda20700cc38bdeb1d64eb47a240c3c72b4e1752677e39157764231ee2667ab36ccdbfba42457f8aa78190e9f349fdb0f39419a0118585b830e1f5384814e9656b8979aa59833641c241d35c05dc76d7e364aee2450106ab83406673fc18e931b92e5ccdb9c147b867649519adf577c562d87284c4674ee2b4300dc24d0f1a6dc1181b28b14322e7102cb0bf4959f2d49c55f76b438bb3b98b1ae81660da05395dd2780c2b7a57f91dfea8ab8e0ef39c6d3aa90b6a9c796dc7a5442582066d7eb35d61e41e26ad02c5bec835f0e56f87369a55eb8aa9267638b4cffbf8595a67158f55c8dc85e4c607c114f2d51f5bbd0424906bd3a49b3979ccc1fd3266c11b4f6fee01452a215c2537200e2f96527fbfb2a2525cf4a856a3d7ad224f90e77ebd1564d83a75c34e4bfbb3a2e9112af6d5d684c693079671817d04798e47a891313e74401893d3cbed23ffcba13c62a9815a2207d3b4791a77bcd52326a8acd57918a371552bb46e486f1a6217e10ae74f5f8e4c1984c28ef8ac960abeb001c26282439eae48249cce5272acaba1be1ce770cd90c68efbda84dd3ccf2f2ce51d9b7351703d7cb6d928f27d0a662c26e54a6342d509e877b8355a50c2fb23f8f680c063a49d6ab31a2b34a17038141b04c19221df2f229ce7ca70b837ebf0c3a030527fc7037172d0ddc595e1aaba4774c1746a83dff4867b5986c5afe399c93ead34e37aaa79e48def89950118f5ab0c7d66074dd680fbc7146c977135a6aef55617befeba25f269b606a21f8880ce2c30e0ce8b898643c08871773ac1e41f62d86c24060b1072418275ded45bb819939ca45d681878ec16257902ce4d4aebc709027d77f2c8c622ce7f1a7f79a2d5efd460266a059ad242ff7b64947f44d1b9bd8d29a633b9223fb75ce14deb158c81e9a1703395531d173bdd88b8df90bee088618e12b875e42f45ff5cc7159b136e05b2426628b0dafa076e5dcc223a37cf5f0df7e75607f040101000000000000000000000000000000000000000000000000000000000000000400000000000000726f6f747aaa96c657582d963de258f184da3d7c95042920db92a2b2591c181466ea5a5311b5ef84f135b3d567120eaae941f35f8d5d62a8f42c8c9dacd2c78cc6f02e558d0d18fc4e78997967851fef237755ee6ee490036925c7fb100eefdbec1c033b8332252314a8fd0c05a01f9a8b87372381ee179818e8ffff36dc94a411c0d75e9ded4fcdf533fd58fc80c8dae586d783ed32168744d0f952dee4f02ce4e25f552327ac75c4aba87513dc54e4a5c2e2e36835828113ef92fea59dbf2457575903bf3156016acac7a44a1d6b546f4199bba7b24966c739ddc433a521ee5a776148349a0a53a6cd16d1cd20e13120bd404fd23a752a8f3facd53b78d360d3f3a03e57bf726eed5f1d8d4c530cd187919796fbb4cdc4dceb809f3839bcb453ae7022ae10a0f7ee7f4355e9d74fbf55d3221bb0beb1bf9ae1f6927e9d3cce9f24581640d55c7bf2cd4b6f130ef439a20b990223bb9022446b7e02e502619b4dd3f80d31e6ca8a4c8785453c9a4886d5e9159bcd1974030e70d1cdd008f3408845871c4cbfb0554963f5f47b91a81a0d1f7370be7c072d77a9e03489921981f503ec2f29a07829b2b4f9f285e2ff0d50378d59b12ad2fb8386001e561c3c3c5e66df31256fac5c58b056a49ffe0c23e8e583944e0252529b1c8438fbd22be0d89d5838bc023097bb353188a830dc1a280a0d36ad045d0691354f4a3cdf06724101be6bc23a3f90ad62b7eb699b215644326e61c546068bb46871cc5007e81aa117c1538a9297e803ff05b1f631d15791d5f3e179718a3a752649ef7c13f4e03f0390117a7e8542930b0d81da721a28e246a451c995bcc2f6a1961b56c6e0c030563068b32b6a97b404c884d9430e60d070354accd59c9e4e01f816c149898241f7f42e8724c0af7e5e84b28c9d830add2ab94c78dc474e06ca84d444267d37c86697615396cd4c74e95815fafd25e0f96ea952a9d2de0fbb646e83bf25147ed597df42";
let data = hex::decode(hexdata).unwrap();
let data = Pdu::decode(&mut &data[..]).unwrap();
let _data = Pdu::decode(&mut &data[..]).unwrap();
}
}

0 comments on commit 7e6a39e

Please sign in to comment.