Clippy lints

This commit is contained in:
Dastan-glitch
2022-09-21 03:47:24 +03:00
parent bf79c2c6c8
commit a50de65a78
28 changed files with 803 additions and 861 deletions

View File

@@ -1,14 +1,10 @@
use ::darkfi::{
stakeholder::Stakeholder,
blockchain::{EpochConsensus,},
net::{Settings,},
};
use ::darkfi::{blockchain::EpochConsensus, net::Settings, stakeholder::Stakeholder};
use futures::executor::block_on;
use url::Url;
use std::thread;
use vec;
use clap::Parser;
use futures::executor::block_on;
use std::thread;
use url::Url;
use vec;
#[derive(Parser)]
struct NetCli {
@@ -17,22 +13,23 @@ struct NetCli {
peers: Vec<String>,
}
#[async_std::main]
async fn main()
{
async fn main() {
let args = NetCli::parse();
let addr = vec!(Url::parse(args.addr.as_str()).unwrap());
let addr = vec![Url::parse(args.addr.as_str()).unwrap()];
let mut peers = vec![];
for i in 0..args.peers.len() {
peers.push(Url::parse(args.peers[i].as_str()).unwrap());
}
let seeds = [Url::parse("tls://irc0.dark.fi:11001").unwrap(),
Url::parse("tls://irc1.dark.fi:11001").unwrap()].to_vec();
let slots=3;
let epochs=3;
let ticks=10;
let reward=1;
let seeds = [
Url::parse("tls://irc0.dark.fi:11001").unwrap(),
Url::parse("tls://irc1.dark.fi:11001").unwrap(),
]
.to_vec();
let slots = 3;
let epochs = 3;
let ticks = 10;
let reward = 1;
let epoch_consensus = EpochConsensus::new(Some(slots), Some(epochs), Some(ticks), Some(reward));
// initialize n stakeholders
let settings = Settings {
@@ -44,22 +41,25 @@ async fn main()
channel_handshake_seconds: 4,
channel_heartbeat_seconds: 10,
external_addr: addr.clone(),
peers: peers,
seeds: seeds,
peers,
seeds,
..Default::default()
};
//proof's number of rows
let k : u32 = 13;
let mut handles = vec!();
let k: u32 = 13;
let mut handles = vec![];
let path = args.path;
for i in 0..2 {
let rel_path = format!("{}{}",path, i.to_string());
let rel_path = format!("{}{}", path, i.to_string());
let mut stakeholder = block_on(Stakeholder::new(epoch_consensus.clone(),
settings.clone(),
&rel_path,
i,
Some(k))).unwrap();
let mut stakeholder = block_on(Stakeholder::new(
epoch_consensus.clone(),
settings.clone(),
&rel_path,
i,
Some(k),
))
.unwrap();
let handle = thread::spawn(move || {
block_on(stakeholder.background(Some(9)));

View File

@@ -8,32 +8,28 @@ use pasta_curves::{
use futures::executor::block_on;
use darkfi::crypto::proof::VerifyingKey;
use darkfi::crypto::proof::ProvingKey;
use darkfi::crypto::proof::{ProvingKey, VerifyingKey};
use url::Url;
use darkfi::{
blockchain::{
Blockchain,
EpochConsensus,
epoch::{Epoch,EpochItem},
epoch::{Epoch, EpochItem},
Blockchain, EpochConsensus,
},
stakeholder::stakeholder::{Stakeholder},
util::time::{Timestamp},
consensus::{BlockInfo, StakeholderMetadata, StreamletMetadata, TransactionLeadProof},
crypto::{
constants::MERKLE_DEPTH_ORCHARD,
leadcoin::{LeadCoin,LEAD_PUBLIC_INPUT_LEN},
lead_proof,
leadcoin::{LeadCoin, LEAD_PUBLIC_INPUT_LEN},
merkle_node::MerkleNode,
},
net::{P2p, Settings, SettingsPtr},
stakeholder::stakeholder::Stakeholder,
tx::Transaction,
consensus::{TransactionLeadProof, StakeholderMetadata, StreamletMetadata, BlockInfo},
net::{P2p,Settings, SettingsPtr,},
util::time::Timestamp,
zk::circuit::lead_contract::LeadContract,
};
fn main() {
let k: u32 = 13;
//
@@ -44,32 +40,30 @@ fn main() {
value: 332233, //static stake value
};
//
let settings = Settings{
inbound: vec!(Url::parse("tls://127.0.0.1:12002").unwrap()),
let settings = Settings {
inbound: vec![Url::parse("tls://127.0.0.1:12002").unwrap()],
outbound_connections: 4,
manual_attempt_limit: 0,
seed_query_timeout_seconds: 8,
connect_timeout_seconds: 10,
channel_handshake_seconds: 4,
channel_heartbeat_seconds: 10,
external_addr: vec!(Url::parse("tls://127.0.0.1:12002").unwrap()),
external_addr: vec![Url::parse("tls://127.0.0.1:12002").unwrap()],
peers: [Url::parse("tls://127.0.0.1:12003").unwrap()].to_vec(),
seeds: [Url::parse("tls://irc0.dark.fi:11001").unwrap(),
Url::parse("tls://irc1.dark.fi:11001").unwrap(),
].to_vec(),
seeds: [
Url::parse("tls://irc0.dark.fi:11001").unwrap(),
Url::parse("tls://irc1.dark.fi:11001").unwrap(),
]
.to_vec(),
..Default::default()
};
let consensus = EpochConsensus::new(Some(22), Some(3), Some(22), Some(0));
let stakeholder : Stakeholder = block_on(Stakeholder::new(consensus, settings, "db", 0, Some(k))).unwrap();
let stakeholder: Stakeholder =
block_on(Stakeholder::new(consensus, settings, "db", 0, Some(k))).unwrap();
let eta : pallas::Base = stakeholder.get_eta();
let mut epoch = Epoch {
len: Some(LEN),
item: Some(epoch_item),
eta: eta,
coins: vec![],
};
let eta: pallas::Base = stakeholder.get_eta();
let mut epoch = Epoch { len: Some(LEN), item: Some(epoch_item), eta, coins: vec![] };
// sigma is nubmer of slots * reward (assuming reward is 1 for simplicity)
let sigma = pallas::Base::from(10);
let coins: Vec<LeadCoin> = epoch.create_coins(sigma);
@@ -77,7 +71,7 @@ fn main() {
let coin = coins[coin_idx];
let contract = coin.create_contract();
let public_inputs : [pallas::Base;LEAD_PUBLIC_INPUT_LEN] = coin.public_inputs_as_array();
let public_inputs: [pallas::Base; LEAD_PUBLIC_INPUT_LEN] = coin.public_inputs_as_array();
let lead_pk = stakeholder.get_provkingkey();
let lead_vk = stakeholder.get_verifyingkey();

View File

@@ -69,7 +69,7 @@ impl ProgramOptions {
let connection_slots = if let Some(connection_slots) = programcli.connect_slots {
connection_slots
} else {
} else {
0
};