gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-23 23:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure test_harness crate compiles under v0.5.0

Browse Source
This commit is contained in:
Paul Hauner
2019-03-17 19:19:52 +11:00
parent df3f8df7bd
commit 446ff0c27e
4 changed files with 51 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
eth2/types/src/test_utils/testing_beacon_block_builder.rs
View File

@@ -180,9 +180,14 @@ impl TestingBeaconBlockBuilder {
) {
let keypair = Keypair::random();
let mut builder = TestingDepositBuilder::new(amount);
let mut builder = TestingDepositBuilder::new(keypair.pk.clone(), amount);
builder.set_index(index);
builder.sign(&keypair, state, spec);
builder.sign(
&keypair,
state.slot.epoch(spec.slots_per_epoch),
&state.fork,
spec,
);
self.block.body.deposits.push(builder.build())
}

12
eth2/types/src/test_utils/testing_deposit_builder.rs
View File

@@ -10,9 +10,7 @@ pub struct TestingDepositBuilder {
impl TestingDepositBuilder {
/// Instantiates a new builder.
pub fn new(amount: u64) -> Self {
let keypair = Keypair::random();
pub fn new(pubkey: PublicKey, amount: u64) -> Self {
let deposit = Deposit {
proof: vec![],
index: 0,
@@ -20,7 +18,7 @@ impl TestingDepositBuilder {
amount,
timestamp: 1,
deposit_input: DepositInput {
pubkey: keypair.pk,
pubkey,
withdrawal_credentials: Hash256::zero(),
proof_of_possession: Signature::empty_signature(),
},
@@ -40,13 +38,11 @@ impl TestingDepositBuilder {
/// - `pubkey` to the signing pubkey.
/// - `withdrawal_credentials` to the signing pubkey.
/// - `proof_of_possesssion`
pub fn sign(&mut self, keypair: &Keypair, state: &BeaconState, spec: &ChainSpec) {
pub fn sign(&mut self, keypair: &Keypair, epoch: Epoch, fork: &Fork, spec: &ChainSpec) {
let withdrawal_credentials = Hash256::from_slice(
&get_withdrawal_credentials(&keypair.pk, spec.bls_withdrawal_prefix_byte)[..],
);
let epoch = state.current_epoch(spec);
self.deposit.deposit_data.deposit_input.pubkey = keypair.pk.clone();
self.deposit
.deposit_data
@@ -57,7 +53,7 @@ impl TestingDepositBuilder {
.deposit
.deposit_data
.deposit_input
.create_proof_of_possession(&keypair.sk, epoch, &state.fork, spec);
.create_proof_of_possession(&keypair.sk, epoch, fork, spec);
}
/// Builds the deposit, consuming the builder.