cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'interop' of github.com:sigp/lighthouse into interop

Browse Source
This commit is contained in:
Paul Hauner 2019-09-08 12:25:35 -04:00
commit 834c36d602
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
beacon_node/eth2-libp2p/src/rpc/codec/base.rs
View File

@ -101,13 +101,15 @@ where
type Error = <TCodec as Decoder>::Error; type Error = <TCodec as Decoder>::Error;
fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> { fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
// if we have only received the response code, wait for more bytes
if src.len() == 1 {
return Ok(None);
}
// using the response code determine which kind of payload needs to be decoded.
let response_code = { let response_code = {
if let Some(resp_code) = self.response_code { if let Some(resp_code) = self.response_code {
resp_code resp_code
} else { } else {
// buffer should not be empty
debug_assert!(!src.is_empty());
let resp_byte = src.split_to(1); let resp_byte = src.split_to(1);
let mut resp_code_byte = [0; 1]; let mut resp_code_byte = [0; 1];
resp_code_byte.copy_from_slice(&resp_byte); resp_code_byte.copy_from_slice(&resp_byte);

10
beacon_node/eth2-libp2p/src/rpc/codec/ssz.rs
View File

@ -4,7 +4,7 @@ use crate::rpc::{
protocol::{ProtocolId, RPCError}, protocol::{ProtocolId, RPCError},
}; };
use crate::rpc::{ErrorMessage, RPCErrorResponse, RPCRequest, RPCResponse}; use crate::rpc::{ErrorMessage, RPCErrorResponse, RPCRequest, RPCResponse};
use bytes::{Bytes, BytesMut}; use bytes::{BufMut, Bytes, BytesMut};
use ssz::{Decode, Encode}; use ssz::{Decode, Encode};
use tokio::codec::{Decoder, Encoder}; use tokio::codec::{Decoder, Encoder};
use unsigned_varint::codec::UviBytes; use unsigned_varint::codec::UviBytes;
@ -56,6 +56,10 @@ impl Encoder for SSZInboundCodec {
.inner .inner
.encode(Bytes::from(bytes), dst) .encode(Bytes::from(bytes), dst)
.map_err(RPCError::from); .map_err(RPCError::from);
} else {
// payload is empty, add a 0-byte length prefix
dst.reserve(1);
dst.put_u8(0);
} }
Ok(()) Ok(())
} }
@ -152,8 +156,8 @@ impl Decoder for SSZOutboundCodec {
type Error = RPCError; type Error = RPCError;
fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> { fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
if src.is_empty() { if src.len() == 1 && src[0] == 0_u8 {
// the object sent could be empty. We return the empty object if this is the case // the object is empty. We return the empty object if this is the case
match self.protocol.message_name.as_str() { match self.protocol.message_name.as_str() {
"hello" => match self.protocol.version.as_str() { "hello" => match self.protocol.version.as_str() {
"1" => Err(RPCError::Custom( "1" => Err(RPCError::Custom(