Fix warnings and clippy lints
This commit is contained in:
parent
87feeea1fd
commit
ede5685bc2
@ -10,10 +10,7 @@ use fork_choice::BitwiseLMDGhost;
|
|||||||
use log::debug;
|
use log::debug;
|
||||||
use rayon::prelude::*;
|
use rayon::prelude::*;
|
||||||
use slot_clock::TestingSlotClock;
|
use slot_clock::TestingSlotClock;
|
||||||
use ssz::TreeHash;
|
|
||||||
use std::collections::HashSet;
|
use std::collections::HashSet;
|
||||||
use std::fs::File;
|
|
||||||
use std::io::prelude::*;
|
|
||||||
use std::iter::FromIterator;
|
use std::iter::FromIterator;
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use types::*;
|
use types::*;
|
||||||
@ -291,12 +288,4 @@ impl BeaconChainHarness {
|
|||||||
pub fn chain_dump(&self) -> Result<Vec<CheckPoint>, BeaconChainError> {
|
pub fn chain_dump(&self) -> Result<Vec<CheckPoint>, BeaconChainError> {
|
||||||
self.beacon_chain.chain_dump()
|
self.beacon_chain.chain_dump()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Write the output of `chain_dump` to a JSON file.
|
|
||||||
pub fn dump_to_file(&self, filename: String, chain_dump: &[CheckPoint]) {
|
|
||||||
let json = serde_json::to_string(chain_dump).unwrap();
|
|
||||||
let mut file = File::create(filename).unwrap();
|
|
||||||
file.write_all(json.as_bytes())
|
|
||||||
.expect("Failed writing dump to file.");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,27 +1,16 @@
|
|||||||
use attester::Signer as AttesterSigner;
|
use attester::Signer as AttesterSigner;
|
||||||
use block_proposer::Signer as BlockProposerSigner;
|
use block_proposer::Signer as BlockProposerSigner;
|
||||||
use std::sync::RwLock;
|
|
||||||
use types::{Keypair, Signature};
|
use types::{Keypair, Signature};
|
||||||
|
|
||||||
/// A test-only struct used to perform signing for a proposer or attester.
|
/// A test-only struct used to perform signing for a proposer or attester.
|
||||||
pub struct LocalSigner {
|
pub struct LocalSigner {
|
||||||
keypair: Keypair,
|
keypair: Keypair,
|
||||||
should_sign: RwLock<bool>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl LocalSigner {
|
impl LocalSigner {
|
||||||
/// Produce a new TestSigner with signing enabled by default.
|
/// Produce a new TestSigner with signing enabled by default.
|
||||||
pub fn new(keypair: Keypair) -> Self {
|
pub fn new(keypair: Keypair) -> Self {
|
||||||
Self {
|
Self { keypair }
|
||||||
keypair,
|
|
||||||
should_sign: RwLock::new(true),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// If set to `false`, the service will refuse to sign all messages. Otherwise, all messages
|
|
||||||
/// will be signed.
|
|
||||||
pub fn enable_signing(&self, enabled: bool) {
|
|
||||||
*self.should_sign.write().unwrap() = enabled;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Sign some message.
|
/// Sign some message.
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
use super::Error;
|
use super::Error;
|
||||||
use log::error;
|
|
||||||
use types::*;
|
use types::*;
|
||||||
|
|
||||||
macro_rules! ensure {
|
macro_rules! ensure {
|
||||||
@ -27,17 +26,14 @@ pub fn verify_slashable_attestation(
|
|||||||
| slashable_attestation_1.is_surround_vote(slashable_attestation_2, spec),
|
| slashable_attestation_1.is_surround_vote(slashable_attestation_2, spec),
|
||||||
Error::BadAttesterSlashing
|
Error::BadAttesterSlashing
|
||||||
);
|
);
|
||||||
error!("this a");
|
|
||||||
ensure!(
|
ensure!(
|
||||||
state.verify_slashable_attestation(&slashable_attestation_1, spec),
|
state.verify_slashable_attestation(&slashable_attestation_1, spec),
|
||||||
Error::BadAttesterSlashing
|
Error::BadAttesterSlashing
|
||||||
);
|
);
|
||||||
error!("this b");
|
|
||||||
ensure!(
|
ensure!(
|
||||||
state.verify_slashable_attestation(&slashable_attestation_2, spec),
|
state.verify_slashable_attestation(&slashable_attestation_2, spec),
|
||||||
Error::BadAttesterSlashing
|
Error::BadAttesterSlashing
|
||||||
);
|
);
|
||||||
error!("this c");
|
|
||||||
|
|
||||||
let mut slashable_indices = vec![];
|
let mut slashable_indices = vec![];
|
||||||
for i in &slashable_attestation_1.validator_indices {
|
for i in &slashable_attestation_1.validator_indices {
|
||||||
@ -53,7 +49,7 @@ pub fn verify_slashable_attestation(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ensure!(slashable_indices.len() >= 1, Error::BadAttesterSlashing);
|
ensure!(!slashable_indices.is_empty(), Error::BadAttesterSlashing);
|
||||||
|
|
||||||
for i in slashable_indices {
|
for i in slashable_indices {
|
||||||
state.penalize_validator(*i as usize, spec)?;
|
state.penalize_validator(*i as usize, spec)?;
|
||||||
|
@ -16,8 +16,8 @@ impl AttesterSlashingBuilder {
|
|||||||
let shard = 0;
|
let shard = 0;
|
||||||
let justified_epoch = Epoch::new(0);
|
let justified_epoch = Epoch::new(0);
|
||||||
let epoch = Epoch::new(0);
|
let epoch = Epoch::new(0);
|
||||||
let hash_1 = Hash256::from("1".as_bytes());
|
let hash_1 = Hash256::from(&[1][..]);
|
||||||
let hash_2 = Hash256::from("2".as_bytes());
|
let hash_2 = Hash256::from(&[2][..]);
|
||||||
|
|
||||||
let mut slashable_attestation_1 = SlashableAttestation {
|
let mut slashable_attestation_1 = SlashableAttestation {
|
||||||
validator_indices: validator_indices.to_vec(),
|
validator_indices: validator_indices.to_vec(),
|
||||||
|
@ -419,8 +419,7 @@ impl BeaconState {
|
|||||||
committees_per_epoch
|
committees_per_epoch
|
||||||
);
|
);
|
||||||
|
|
||||||
let active_validator_indices: Vec<usize> =
|
let active_validator_indices: Vec<usize> = active_validator_indices.to_vec();
|
||||||
active_validator_indices.iter().cloned().collect();
|
|
||||||
|
|
||||||
let shuffled_active_validator_indices = shuffle_list(
|
let shuffled_active_validator_indices = shuffle_list(
|
||||||
active_validator_indices,
|
active_validator_indices,
|
||||||
|
@ -14,13 +14,13 @@ impl ProposerSlashingBuilder {
|
|||||||
let proposal_data_1 = ProposalSignedData {
|
let proposal_data_1 = ProposalSignedData {
|
||||||
slot,
|
slot,
|
||||||
shard,
|
shard,
|
||||||
block_root: Hash256::from("one".as_bytes()),
|
block_root: Hash256::from(&[1][..]),
|
||||||
};
|
};
|
||||||
|
|
||||||
let proposal_data_2 = ProposalSignedData {
|
let proposal_data_2 = ProposalSignedData {
|
||||||
slot,
|
slot,
|
||||||
shard,
|
shard,
|
||||||
block_root: Hash256::from("two".as_bytes()),
|
block_root: Hash256::from(&[2][..]),
|
||||||
};
|
};
|
||||||
|
|
||||||
let proposal_signature_1 = {
|
let proposal_signature_1 = {
|
||||||
|
@ -5,7 +5,7 @@ use bls_aggregates::AggregatePublicKey as RawAggregatePublicKey;
|
|||||||
///
|
///
|
||||||
/// This struct is a wrapper upon a base type and provides helper functions (e.g., SSZ
|
/// This struct is a wrapper upon a base type and provides helper functions (e.g., SSZ
|
||||||
/// serialization).
|
/// serialization).
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone, Default)]
|
||||||
pub struct AggregatePublicKey(RawAggregatePublicKey);
|
pub struct AggregatePublicKey(RawAggregatePublicKey);
|
||||||
|
|
||||||
impl AggregatePublicKey {
|
impl AggregatePublicKey {
|
||||||
|
Loading…
Reference in New Issue
Block a user