added protos specification for Attester and created first draft for attestation_grpc_client (lighthouse-255)

This commit is contained in:
thojest
2019-03-15 11:44:39 +01:00
parent e02bc82b6a
commit 2215aa4b46
4 changed files with 97 additions and 8 deletions

View File

@@ -0,0 +1,32 @@
use protos::services_grpc::AttestationServiceClient;
use std::sync::Arc;
use attester::{BeaconNode, BeaconNodeError, PublishOutcome};
use types::{AttestationData, FreeAttestation, Slot};
pub struct AttestationGrpcClient {
client: Arc<AttestationServiceClient>,
}
impl AttestationGrpcClient {
pub fn new(client: Arc<AttestationServiceClient>) -> Self {
Self { client }
}
}
impl BeaconNode for AttestationGrpcClient {
fn produce_attestation_data(
&self,
slot: Slot,
shard: u64,
) -> Result<Option<AttestationData>, BeaconNodeError> {
Err(BeaconNodeError::DecodeFailure)
}
fn publish_attestation_data(
&self,
free_attestation: FreeAttestation,
) -> Result<PublishOutcome, BeaconNodeError> {
Err(BeaconNodeError::DecodeFailure)
}
}

View File

@@ -1,8 +1,11 @@
mod attestation_grpc_client;
use attester::{Attester, BeaconNode, DutiesReader, PollOutcome as AttesterPollOutcome, Signer};
use slog::Logger;
use slog::{error, info, warn, Logger};
use slot_clock::SlotClock;
use std::time::Duration;
pub use self::attestation_grpc_client::AttestationGrpcClient;
pub struct AttesterService<T: SlotClock, U: BeaconNode, V: DutiesReader, W: Signer> {
pub attester: Attester<T, U, V, W>,
pub poll_interval_millis: u64,

View File

@@ -1,13 +1,15 @@
use self::block_producer_service::{BeaconBlockGrpcClient, BlockProducerService};
use self::duties::{DutiesManager, DutiesManagerService, EpochDutiesMap};
use crate::attester_service::AttesterService;
use crate::attester_service::{AttestationGrpcClient, AttesterService};
use crate::config::ClientConfig;
use attester::{test_utils::LocalSigner as AttesterLocalSigner, Attester};
use block_proposer::{test_utils::LocalSigner as BlockProposerLocalSigner, BlockProducer};
use bls::Keypair;
use clap::{App, Arg};
use grpcio::{ChannelBuilder, EnvBuilder};
use protos::services_grpc::{BeaconBlockServiceClient, ValidatorServiceClient};
use protos::services_grpc::{
AttestationServiceClient, BeaconBlockServiceClient, ValidatorServiceClient,
};
use slog::{error, info, o, Drain};
use slot_clock::SystemTimeSlotClock;
use std::path::PathBuf;
@@ -106,6 +108,13 @@ fn main() {
Arc::new(ValidatorServiceClient::new(ch))
};
//Beacon node gRPC attester endpoints.
let attester_grpc_client = {
let env = Arc::new(EnvBuilder::new().build());
let ch = ChannelBuilder::new(env).connect(&config.server);
Arc::new(AttestationServiceClient::new(ch))
};
// Spec
let spec = Arc::new(config.spec.clone());
@@ -182,15 +191,13 @@ fn main() {
})
};
//Spawn a new thread for attestation for the validator.
// Spawn a new thread for attestation for the validator.
let attester_thread = {
let signer = Arc::new(AttesterLocalSigner::new(keypair.clone()));
let duties_map = duties_map.clone();
let slot_clock = slot_clock.clone();
let log = log.clone();
//TODO: this is wrong, I assume this has to be AttesterGrpcClient, which has to be defined analogous
// to beacon_block_grpc_client.rs
let client = Arc::new(BeaconBlockGrpcClient::new(beacon_block_grpc_client.clone()));
let client = Arc::new(AttestationGrpcClient::new(attester_grpc_client.clone()));
thread::spawn(move || {
let attester = Attester::new(duties_map, slot_clock, client, signer);
let mut attester_service = AttesterService {
@@ -199,7 +206,7 @@ fn main() {
log,
};
block_producer_service.run();
attester_service.run();
})
};