Decode refuse reason in handshake

This commit is contained in:
Santiago Carmuega 2021-11-21 12:02:14 -03:00
parent c2d537b83f
commit c203f70693
3 changed files with 79 additions and 79 deletions

View file

@ -2,8 +2,8 @@ use core::panic;
use std::collections::HashMap;
use pallas_machines::{
Agent, DecodePayload, EncodePayload, MachineError, MachineOutput,
PayloadDecoder, PayloadEncoder,
Agent, DecodePayload, EncodePayload, MachineError, MachineOutput, PayloadDecoder,
PayloadEncoder,
};
use crate::common::{RefuseReason, VersionNumber};
@ -28,6 +28,17 @@ impl VersionTable {
VersionTable { values }
}
pub fn v6_and_above(network_magic: u64) -> VersionTable {
let values = vec![
(PROTOCOL_V6, VersionData::new(network_magic, false)),
(PROTOCOL_V7, VersionData::new(network_magic, false)),
]
.into_iter()
.collect::<HashMap<u64, VersionData>>();
VersionTable { values }
}
}
#[derive(Debug, Clone)]
@ -37,10 +48,7 @@ pub struct VersionData {
}
impl VersionData {
pub fn new(
network_magic: u64,
initiator_and_responder_diffusion_mode: bool,
) -> Self {
pub fn new(network_magic: u64, initiator_and_responder_diffusion_mode: bool) -> Self {
VersionData {
network_magic,
initiator_and_responder_diffusion_mode,
@ -49,10 +57,7 @@ impl VersionData {
}
impl EncodePayload for VersionData {
fn encode_payload(
&self,
e: &mut PayloadEncoder,
) -> Result<(), Box<dyn std::error::Error>> {
fn encode_payload(&self, e: &mut PayloadEncoder) -> Result<(), Box<dyn std::error::Error>> {
e.array(2)?
.u64(self.network_magic)?
.bool(self.initiator_and_responder_diffusion_mode)?;
@ -62,9 +67,7 @@ impl EncodePayload for VersionData {
}
impl DecodePayload for VersionData {
fn decode_payload(
d: &mut PayloadDecoder,
) -> Result<Self, Box<dyn std::error::Error>> {
fn decode_payload(d: &mut PayloadDecoder) -> Result<Self, Box<dyn std::error::Error>> {
d.array()?;
let network_magic = d.u64()?;
let initiator_and_responder_diffusion_mode = d.bool()?;
@ -84,10 +87,7 @@ pub enum Message {
}
impl EncodePayload for Message {
fn encode_payload(
&self,
e: &mut PayloadEncoder,
) -> Result<(), Box<dyn std::error::Error>> {
fn encode_payload(&self, e: &mut PayloadEncoder) -> Result<(), Box<dyn std::error::Error>> {
match self {
Message::Propose(version_table) => {
e.array(2)?.u16(0)?;
@ -109,24 +109,22 @@ impl EncodePayload for Message {
}
impl DecodePayload for Message {
fn decode_payload(
d: &mut PayloadDecoder,
) -> Result<Self, Box<dyn std::error::Error>> {
fn decode_payload(d: &mut PayloadDecoder) -> Result<Self, Box<dyn std::error::Error>> {
d.array()?;
let msg = match d.u16()? {
match d.u16()? {
0 => todo!(),
1 => {
let version_number = d.u64()?;
let version_data = VersionData::decode_payload(d)?;
Message::Accept(version_number, version_data)
Ok(Message::Accept(version_number, version_data))
}
2 => todo!(),
x => return Err(Box::new(MachineError::BadLabel(x))),
};
Ok(msg)
2 => {
let reason = RefuseReason::decode_payload(d)?;
Ok(Message::Refuse(reason))
}
x => Err(Box::new(MachineError::BadLabel(x))),
}
}
}
@ -176,10 +174,7 @@ impl Agent for Client {
}
}
fn send_next(
self,
tx: &impl MachineOutput,
) -> Result<Self, Box<dyn std::error::Error>> {
fn send_next(self, tx: &impl MachineOutput) -> Result<Self, Box<dyn std::error::Error>> {
match self.state {
State::Propose => {
tx.send_msg(&Message::Propose(self.version_table.clone()))?;
@ -193,10 +188,7 @@ impl Agent for Client {
}
}
fn receive_next(
self,
msg: Self::Message,
) -> Result<Self, Box<dyn std::error::Error>> {
fn receive_next(self, msg: Self::Message) -> Result<Self, Box<dyn std::error::Error>> {
match (self.state, msg) {
(State::Confirm, Message::Accept(version, data)) => Ok(Self {
state: State::Done,