X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fpeer.rs;h=4e81175e0f3baa582ec8b7cd064d2e9693c52557;hb=HEAD;hp=aeeb2c2c582e7ba9c0546c5a08010468a6ef7fe1;hpb=c1b7bcd7a464506a551f618a5afbbaf6ecbc0f1c;p=dnsseed-rust

diff --git a/src/peer.rs b/src/peer.rs
index aeeb2c2..4e81175 100644
--- a/src/peer.rs
+++ b/src/peer.rs
@@ -5,7 +5,7 @@ use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
 use bitcoin::consensus::encode;
 use bitcoin::consensus::encode::{Decodable, Encodable};
 use bitcoin::network::address::Address;
-use bitcoin::network::constants::Network;
+use bitcoin::network::constants::{Network, ServiceFlags};
 use bitcoin::network::message::{RawNetworkMessage, NetworkMessage};
 use bitcoin::network::message_network::VersionMessage;
 
@@ -67,13 +67,6 @@ impl<'a> codec::Decoder for MsgCoder<'a> {
 			},
 			Err(e) => match e {
 				encode::Error::Io(_) => Ok(None),
-				encode::Error::UnrecognizedNetworkCommand(ref msg) => {
-					decoder.buf.advance(decoder.pos);
-					//XXX(fixthese): self.0.add_line(format!("rust-bitcoin doesn't support {}!", msg), true);
-					if msg == "gnop" {
-						Err(e)
-					} else { Ok(Some(None)) }
-				},
 				_ => {
 					self.0.add_line(format!("Error decoding message: {:?}", e), true);
 					Err(e)
@@ -198,10 +191,10 @@ impl Peer {
 					}));
 				let _ = sender.try_send(NetworkMessage::Version(VersionMessage {
 					version: 70015,
-					services: (1 << 3), // NODE_WITNESS
+					services: ServiceFlags::WITNESS,
 					timestamp: SystemTime::now().duration_since(UNIX_EPOCH).expect("time > 1970").as_secs() as i64,
-					receiver: Address::new(&addr, 0),
-					sender: Address::new(&"0.0.0.0:0".parse().unwrap(), 0),
+					receiver: Address::new(&addr, ServiceFlags::NONE),
+					sender: Address::new(&"0.0.0.0:0".parse().unwrap(), ServiceFlags::WITNESS),
 					nonce: 0xdeadbeef,
 					user_agent: "/rust-bitcoin:0.18/bluematt-tokio-client:0.1/".to_string(),
 					start_height: 0,