use futures::sync::mpsc;
use crate::printer::Printer;
-use crate::timeout_stream::TimeoutStream;
struct BytesCoder<'a>(&'a mut bytes::BytesMut);
impl<'a> std::io::Write for BytesCoder<'a> {
struct MsgCoder<'a>(&'a Printer);
impl<'a> codec::Decoder for MsgCoder<'a> {
type Item = NetworkMessage;
- type Error = std::io::Error;
+ type Error = encode::Error;
- fn decode(&mut self, bytes: &mut bytes::BytesMut) -> Result<Option<NetworkMessage>, std::io::Error> {
+ fn decode(&mut self, bytes: &mut bytes::BytesMut) -> Result<Option<NetworkMessage>, encode::Error> {
let mut decoder = BytesDecoder {
buf: bytes,
pos: 0
if res.magic == Network::Bitcoin.magic() {
Ok(Some(res.payload))
} else {
- Err(std::io::Error::new(std::io::ErrorKind::InvalidData, "bad net magic"))
+ Err(encode::Error::UnexpectedNetworkMagic {
+ expected: Network::Bitcoin.magic(),
+ actual: res.magic
+ })
}
},
Err(e) => match e {
encode::Error::Io(_) => Ok(None),
- encode::Error::UnrecognizedNetworkCommand(_msg) => {
+ encode::Error::UnrecognizedNetworkCommand(ref msg) => {
decoder.buf.advance(decoder.pos);
//XXX(fixthese): self.0.add_line(format!("rust-bitcoin doesn't support {}!", msg), true);
- Ok(None)
+ if msg == "gnop" {
+ Err(e)
+ } else { Ok(None) }
},
_ => {
self.0.add_line(format!("Error decoding message: {:?}", e), true);
- Err(std::io::Error::new(std::io::ErrorKind::InvalidData, e))
+ Err(e)
},
}
}
}
}
-pub struct Peer {
-
-}
-
+pub struct Peer {}
impl Peer {
- pub fn new(addr: SocketAddr, timeout: Duration, printer: &'static Printer) -> impl Future<Error=(), Item=(mpsc::Sender<NetworkMessage>, impl Stream<Item=NetworkMessage, Error=std::io::Error>)> {
+ pub fn new(addr: SocketAddr, timeout: Duration, printer: &'static Printer) -> impl Future<Error=(), Item=(mpsc::Sender<NetworkMessage>, impl Stream<Item=NetworkMessage, Error=encode::Error>)> {
let connect_timeout = Delay::new(Instant::now() + timeout.clone()).then(|_| {
future::err(std::io::Error::new(std::io::ErrorKind::TimedOut, "timeout reached"))
});
nonce: 0xdeadbeef,
user_agent: "/rust-bitcoin:0.18/bluematt-tokio-client:0.1/".to_string(),
start_height: 0,
- relay: true,
+ relay: false,
}));
- future::ok((sender, TimeoutStream::new(read, timeout)))
+ future::ok((sender, read))
})
}
}