github/darkfi
1
1
Fork 0
mirror of https://github.com/darkrenaissance/darkfi.git synced 2026-01-09 14:48:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: Clippy lints

Browse Source
This commit is contained in:
parazyd
2023-08-29 13:40:57 +02:00
parent cbe9c64065
commit 27b8d01287
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/darkfid2/src/tests/harness.rs
View File

@@ -87,10 +87,8 @@ impl Harness {
// Generate validators using pregenerated vks
let (_, vks) = vks::read_or_gen_vks_and_pks()?;
let mut sync_settings = Settings::default();
sync_settings.localnet = true;
let mut consensus_settings = Settings::default();
consensus_settings.localnet = true;
let mut sync_settings = Settings { localnet: true, ..Default::default() };
let mut consensus_settings = Settings { localnet: true, ..Default::default() };
// Alice
let alice_url = Url::parse("tcp+tls://127.0.0.1:18340")?;
@@ -175,7 +173,7 @@ impl Harness {
let previous = PreviousSlot::new(
producers,
vec![previous_hash],
vec![previous.header.previous.clone()],
vec![previous.header.previous],
previous_slot.pid.error,
);
let (f, error, sigma1, sigma2) = slot_pid_output(&previous_slot, producers);
@@ -198,7 +196,7 @@ impl Harness {
previous.header.epoch,
slots.last().unwrap().id,
timestamp,
previous.header.root.clone(),
previous.header.root,
);
// Generate block
@@ -218,7 +216,7 @@ pub async fn generate_node(
skip_sync: bool,
) -> Result<Darkfid> {
let sled_db = sled::Config::new().temporary(true).open()?;
vks::inject(&sled_db, &vks)?;
vks::inject(&sled_db, vks)?;
let validator = Validator::new(&sled_db, config.clone()).await?;
@@ -229,7 +227,7 @@ pub async fn generate_node(
subscribers.insert("proposals", JsonSubscriber::new("blockchain.subscribe_proposals"));
}
let sync_p2p = spawn_sync_p2p(&sync_settings, &validator, &subscribers, ex.clone()).await;
let sync_p2p = spawn_sync_p2p(sync_settings, &validator, &subscribers, ex.clone()).await;
let consensus_p2p = if let Some(settings) = consensus_settings {
Some(spawn_consensus_p2p(settings, &validator, &subscribers, ex.clone()).await)
} else {

4
bin/darkfid2/src/tests/mod.rs
View File

@@ -51,8 +51,8 @@ async fn sync_blocks_real(ex: Arc<Executor<'static>>) -> Result<()> {
th.validate_chains(3, 7).await?;
// We are going to create a third node and try to sync from the previous two
let mut sync_settings = Settings::default();
sync_settings.localnet = true;
let mut sync_settings = Settings { localnet: true, ..Default::default() };
let charlie_url = Url::parse("tcp+tls://127.0.0.1:18342")?;
sync_settings.inbound_addrs = vec![charlie_url];
let alice_url = th.alice.sync_p2p.settings().inbound_addrs[0].clone();