Moves message network checking to message parser

DoubleSha · Nov 1, 2015 · b27fd23 · b27fd23
1 parent 8756a45
commit b27fd23
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/BitcoinSwift/MessageParser.swift b/BitcoinSwift/MessageParser.swift
@@ -84,10 +84,14 @@ public class MessageParser {
       }
       let payloadData = NSData(bytes: receivedBytes, length: payloadLength)
       let message = Message(header: receivedHeader!, payloadData: payloadData)
-      if message.isChecksumValid() {
-        delegate?.didParseMessage(message)
+      if message.header.network == network {
+        if message.isChecksumValid() {
+          delegate?.didParseMessage(message)
+        } else {
+          Logger.warn("Dropping \(message.command.rawValue) message with invalid checksum")
+        }
       } else {
-        Logger.warn("Dropping \(message.command.rawValue) message with invalid checksum")
+        Logger.warn("Dropping \(message.command.rawValue) message with invalid network header: \(message.header.network) != \(network)")
       }
       receivedBytes.removeRange(0..<payloadLength)
       receivedHeader = nil

diff --git a/BitcoinSwift/Models/MessageHeader.swift b/BitcoinSwift/Models/MessageHeader.swift
@@ -58,11 +58,6 @@ extension Message.Header: BitcoinSerializable {
       Logger.warn("Failed to parse network magic value in message header")
       return nil
     }
-    let network = Message.Network(rawValue: NetworkMagicNumber(networkRaw!))
-    if network == nil {
-      Logger.warn("Unsupported network \(networkRaw!) in message header")
-      return nil
-    }
     let commandRaw = stream.readASCIIStringWithLength(Message.Command.encodedLength)
     if commandRaw == nil {
       Logger.warn("Failed to parse command in message header")
@@ -83,7 +78,7 @@ extension Message.Header: BitcoinSerializable {
       Logger.warn("Failed to parse payload checksum in message header")
       return nil
     }
-    return Message.Header(network: network!.rawValue,
+    return Message.Header(network: NetworkMagicNumber(networkRaw!),
       command: command!,
       payloadLength: payloadLength!,
       payloadChecksum: payloadChecksum!)

diff --git a/BitcoinSwiftLiveTests/PeerConnectionLiveTest.swift b/BitcoinSwiftLiveTests/PeerConnectionLiveTest.swift
@@ -18,7 +18,7 @@ class PeerConnectionLiveTest: XCTestCase, PeerConnectionDelegate {
   }
 
   func testConnect() {
-    let conn = PeerConnection(hostname: "anduck.net",
+    let conn = PeerConnection(hostname: "localhost",
                               port: 8333,
                               network: Message.Network.MainNet.rawValue,
                               delegate: self)