cargo fmt
This commit is contained in:
parent
f1ae5b1795
commit
0ef099421c
|
@ -1,8 +1,5 @@
|
|||
#![feature(test)]
|
||||
|
||||
|
||||
|
||||
|
||||
extern crate test;
|
||||
|
||||
use solana::bank::*;
|
||||
|
|
|
@ -1,9 +1,5 @@
|
|||
#![feature(test)]
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
extern crate test;
|
||||
|
||||
use rand::{thread_rng, Rng};
|
||||
|
|
|
@ -1,7 +1,6 @@
|
|||
#![feature(test)]
|
||||
use rand;
|
||||
|
||||
|
||||
extern crate test;
|
||||
|
||||
use rand::seq::SliceRandom;
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#![feature(test)]
|
||||
|
||||
|
||||
extern crate test;
|
||||
|
||||
use solana::entry::reconstruct_entries_from_blobs;
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
#![feature(test)]
|
||||
|
||||
|
||||
extern crate test;
|
||||
|
||||
use solana::signature::GenKeys;
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
#![feature(test)]
|
||||
|
||||
|
||||
|
||||
extern crate test;
|
||||
|
||||
use solana::packet::to_packets;
|
||||
|
|
|
@ -1,6 +1,3 @@
|
|||
|
||||
|
||||
|
||||
use clap::{App, Arg};
|
||||
use solana::netutil::bind_to;
|
||||
use solana::packet::{Packet, SharedPackets, BLOB_SIZE, PACKET_DATA_SIZE};
|
||||
|
|
|
@ -6,7 +6,6 @@ extern crate solana;
|
|||
|
||||
use solana_metrics;
|
||||
|
||||
|
||||
use clap::{App, Arg};
|
||||
|
||||
use rayon::prelude::*;
|
||||
|
|
|
@ -4,8 +4,6 @@ use dirs;
|
|||
|
||||
use serde_json;
|
||||
|
||||
|
||||
|
||||
use clap::{App, Arg};
|
||||
use ring::rand::SystemRandom;
|
||||
use ring::signature::Ed25519KeyPair;
|
||||
|
|
|
@ -8,7 +8,6 @@ use serde_json;
|
|||
extern crate solana;
|
||||
use solana_metrics;
|
||||
|
||||
|
||||
use clap::{App, Arg};
|
||||
use solana::client::mk_client;
|
||||
use solana::cluster_info::{Node, FULLNODE_PORT_RANGE};
|
||||
|
|
|
@ -1,13 +1,9 @@
|
|||
//! A command-line executable for generating the chain's genesis block.
|
||||
|
||||
|
||||
#[macro_use]
|
||||
extern crate clap;
|
||||
use serde_json;
|
||||
|
||||
|
||||
|
||||
|
||||
use clap::{App, Arg};
|
||||
use solana::ledger::LedgerWriter;
|
||||
use solana::mint::Mint;
|
||||
|
|
|
@ -2,9 +2,6 @@
|
|||
extern crate clap;
|
||||
use dirs;
|
||||
|
||||
|
||||
|
||||
|
||||
use clap::{App, Arg};
|
||||
use solana::wallet::gen_keypair_file;
|
||||
use std::error;
|
||||
|
|
|
@ -2,7 +2,6 @@
|
|||
extern crate clap;
|
||||
use serde_json;
|
||||
|
||||
|
||||
use clap::{App, Arg, SubCommand};
|
||||
use solana::bank::Bank;
|
||||
use solana::ledger::{read_ledger, verify_ledger};
|
||||
|
|
|
@ -5,8 +5,6 @@ use serde_json;
|
|||
#[macro_use]
|
||||
extern crate solana;
|
||||
|
||||
|
||||
|
||||
use clap::{App, Arg};
|
||||
use solana::cluster_info::{Node, NodeInfo};
|
||||
use solana::fullnode::Config;
|
||||
|
|
|
@ -4,7 +4,6 @@ use dirs;
|
|||
#[macro_use]
|
||||
extern crate solana;
|
||||
|
||||
|
||||
use clap::{App, Arg, ArgMatches, SubCommand};
|
||||
use solana::logger;
|
||||
use solana::wallet::{gen_keypair_file, parse_command, process_command, WalletConfig, WalletError};
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
use crate::chacha::{CHACHA_BLOCK_SIZE, CHACHA_KEY_SIZE};
|
||||
use crate::ledger::LedgerWindow;
|
||||
use crate::sigverify::{chacha_cbc_encrypt_many_sample, chacha_end_sha_state, chacha_init_sha_state};
|
||||
use crate::sigverify::{
|
||||
chacha_cbc_encrypt_many_sample, chacha_end_sha_state, chacha_init_sha_state,
|
||||
};
|
||||
use solana_sdk::hash::Hash;
|
||||
use std::io;
|
||||
use std::mem::size_of;
|
||||
|
|
|
@ -3,12 +3,12 @@ use crate::cluster_info::ClusterInfo;
|
|||
use crate::counter::Counter;
|
||||
use crate::db_ledger::*;
|
||||
use crate::entry::Entry;
|
||||
#[cfg(feature = "erasure")]
|
||||
use crate::erasure;
|
||||
use crate::leader_scheduler::LeaderScheduler;
|
||||
use crate::packet::{SharedBlob, BLOB_HEADER_SIZE};
|
||||
use crate::result::Result;
|
||||
use crate::streamer::BlobSender;
|
||||
#[cfg(feature = "erasure")]
|
||||
use crate::erasure;
|
||||
use log::Level;
|
||||
use rocksdb::DBRawIterator;
|
||||
use solana_metrics::{influxdb, submit};
|
||||
|
@ -400,15 +400,15 @@ fn try_erasure(db_ledger: &mut DbLedger, slot: u64, consume_queue: &mut Vec<Entr
|
|||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::*;
|
||||
use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block};
|
||||
use crate::packet::{Blob, Packet, Packets, SharedBlob, PACKET_DATA_SIZE};
|
||||
use crate::streamer::{receiver, responder, PacketReceiver};
|
||||
#[cfg(all(feature = "erasure", test))]
|
||||
use crate::entry::reconstruct_entries_from_blobs;
|
||||
#[cfg(all(feature = "erasure", test))]
|
||||
use crate::erasure::test::{generate_db_ledger_from_window, setup_window_ledger};
|
||||
#[cfg(all(feature = "erasure", test))]
|
||||
use crate::erasure::{NUM_CODING, NUM_DATA};
|
||||
use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block};
|
||||
use crate::packet::{Blob, Packet, Packets, SharedBlob, PACKET_DATA_SIZE};
|
||||
use crate::streamer::{receiver, responder, PacketReceiver};
|
||||
use rocksdb::{Options, DB};
|
||||
use solana_sdk::signature::{Keypair, KeypairUtil};
|
||||
use std::io;
|
||||
|
|
|
@ -3,10 +3,10 @@ use crate::db_ledger::DbLedger;
|
|||
use crate::db_window::{find_missing_coding_indexes, find_missing_data_indexes};
|
||||
use crate::packet::{Blob, SharedBlob, BLOB_DATA_SIZE, BLOB_HEADER_SIZE, BLOB_SIZE};
|
||||
use crate::result::{Error, Result};
|
||||
use crate::window::WindowSlot;
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use std::cmp;
|
||||
use std::sync::{Arc, RwLock};
|
||||
use crate::window::WindowSlot;
|
||||
|
||||
//TODO(sakridge) pick these values
|
||||
pub const NUM_DATA: usize = 16; // number of data blobs
|
||||
|
@ -558,10 +558,10 @@ pub mod test {
|
|||
use crate::ledger::{get_tmp_ledger_path, make_tiny_test_entries, Block};
|
||||
use crate::logger;
|
||||
use crate::packet::{index_blobs, SharedBlob, BLOB_DATA_SIZE, BLOB_SIZE};
|
||||
use crate::window::WindowSlot;
|
||||
use rand::{thread_rng, Rng};
|
||||
use solana_sdk::pubkey::Pubkey;
|
||||
use solana_sdk::signature::{Keypair, KeypairUtil};
|
||||
use crate::window::WindowSlot;
|
||||
|
||||
#[test]
|
||||
pub fn test_coding() {
|
||||
|
|
|
@ -98,4 +98,3 @@ use solana_jsonrpc_ws_server as jsonrpc_ws_server;
|
|||
#[cfg(test)]
|
||||
#[macro_use]
|
||||
extern crate matches;
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
//! The `logger` module provides a setup function for `env_logger`. Its only function,
|
||||
//! `setup()` may be called multiple times.
|
||||
|
||||
use std::sync::{Once, ONCE_INIT};
|
||||
use env_logger;
|
||||
use std::sync::{Once, ONCE_INIT};
|
||||
|
||||
static INIT: Once = ONCE_INIT;
|
||||
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
use crate::blob_fetch_stage::BlobFetchStage;
|
||||
#[cfg(feature = "chacha")]
|
||||
use crate::chacha::{chacha_cbc_encrypt_file, CHACHA_BLOCK_SIZE};
|
||||
use crate::client::mk_client;
|
||||
use crate::cluster_info::{ClusterInfo, Node, NodeInfo};
|
||||
use crate::db_ledger::DbLedger;
|
||||
|
@ -12,8 +14,6 @@ use crate::store_ledger_stage::StoreLedgerStage;
|
|||
use crate::streamer::BlobReceiver;
|
||||
use crate::window;
|
||||
use crate::window_service::window_service;
|
||||
#[cfg(feature = "chacha")]
|
||||
use crate::chacha::{chacha_cbc_encrypt_file, CHACHA_BLOCK_SIZE};
|
||||
use rand::thread_rng;
|
||||
use rand::Rng;
|
||||
use solana_drone::drone::{request_airdrop_transaction, DRONE_PORT};
|
||||
|
|
|
@ -3,12 +3,12 @@
|
|||
use crate::bank;
|
||||
use crate::cluster_info;
|
||||
use crate::db_ledger;
|
||||
#[cfg(feature = "erasure")]
|
||||
use crate::erasure;
|
||||
use crate::packet;
|
||||
use crate::poh_recorder;
|
||||
use crate::vote_stage;
|
||||
use bincode;
|
||||
#[cfg(feature = "erasure")]
|
||||
use crate::erasure;
|
||||
use rocksdb;
|
||||
use serde_json;
|
||||
use std;
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
// for storage mining. Replicators submit storage proofs, validator then bundles them
|
||||
// to submit its proof for mining to be rewarded.
|
||||
|
||||
#[cfg(all(feature = "chacha", feature = "cuda"))]
|
||||
use crate::chacha_cuda::chacha_cbc_encrypt_file_many_keys;
|
||||
use crate::entry::EntryReceiver;
|
||||
use crate::result::{Error, Result};
|
||||
use crate::service::Service;
|
||||
#[cfg(all(feature = "chacha", feature = "cuda"))]
|
||||
use crate::chacha_cuda::chacha_cbc_encrypt_file_many_keys;
|
||||
use rand::{Rng, SeedableRng};
|
||||
use rand_chacha::ChaChaRng;
|
||||
use solana_sdk::hash::Hash;
|
||||
|
|
|
@ -727,7 +727,10 @@ fn confirm_tx(
|
|||
}
|
||||
}
|
||||
|
||||
fn send_and_confirm_tx(rpc_client: &RpcClient, tx: &Transaction) -> Result<(), Box<dyn error::Error>> {
|
||||
fn send_and_confirm_tx(
|
||||
rpc_client: &RpcClient,
|
||||
tx: &Transaction,
|
||||
) -> Result<(), Box<dyn error::Error>> {
|
||||
let mut send_retries = 3;
|
||||
while send_retries > 0 {
|
||||
let mut status_retries = 4;
|
||||
|
|
|
@ -1,9 +1,6 @@
|
|||
#[macro_use]
|
||||
extern crate log;
|
||||
|
||||
|
||||
|
||||
|
||||
use rayon::iter::*;
|
||||
use solana::cluster_info::{ClusterInfo, Node};
|
||||
use solana::gossip_service::GossipService;
|
||||
|
|
|
@ -1,11 +1,8 @@
|
|||
#[macro_use]
|
||||
extern crate log;
|
||||
|
||||
|
||||
|
||||
use solana;
|
||||
|
||||
|
||||
use solana::blob_fetch_stage::BlobFetchStage;
|
||||
use solana::cluster_info::{ClusterInfo, Node, NodeInfo};
|
||||
use solana::contact_info::ContactInfo;
|
||||
|
|
|
@ -1,10 +1,6 @@
|
|||
|
||||
|
||||
|
||||
use solana;
|
||||
use solana_native_loader;
|
||||
|
||||
|
||||
use solana::bank::Bank;
|
||||
use solana::logger;
|
||||
use solana::mint::Mint;
|
||||
|
|
|
@ -1,8 +1,6 @@
|
|||
#[macro_use]
|
||||
extern crate log;
|
||||
|
||||
|
||||
|
||||
use solana::client::mk_client;
|
||||
use solana::cluster_info::{Node, NodeInfo};
|
||||
use solana::db_ledger::DbLedger;
|
||||
|
|
Loading…
Reference in New Issue