From cdd63551a066a76837097207b3d9c1e9d20ce8a6 Mon Sep 17 00:00:00 2001 From: kirahsapong <102400653+kirahsapong@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:45:19 -0700 Subject: [PATCH] make externalId and protocl optional to pass in (#74) --- Sources/tbDEX/Protocol/Models/Message.swift | 4 ++-- Sources/tbDEX/Protocol/Models/Messages/Close.swift | 2 +- Sources/tbDEX/Protocol/Models/Messages/RFQ.swift | 4 ++-- Tests/tbDEXTests/Protocol/Models/Messages/CloseTests.swift | 5 +---- .../Protocol/Models/Messages/OrderStatusTests.swift | 5 +---- Tests/tbDEXTests/Protocol/Models/Messages/OrderTests.swift | 5 +---- Tests/tbDEXTests/Protocol/Models/Messages/QuoteTests.swift | 5 +---- Tests/tbDEXTests/Protocol/Models/Messages/RFQTests.swift | 5 +---- 8 files changed, 10 insertions(+), 25 deletions(-) diff --git a/Sources/tbDEX/Protocol/Models/Message.swift b/Sources/tbDEX/Protocol/Models/Message.swift index 5b33cdd..5b2b614 100644 --- a/Sources/tbDEX/Protocol/Models/Message.swift +++ b/Sources/tbDEX/Protocol/Models/Message.swift @@ -26,8 +26,8 @@ public struct Message<D: MessageData>: Codable, Equatable { to: String, exchangeID: String, data: D, - externalID: String?, - `protocol`: String? + externalID: String? = nil, + `protocol`: String? = nil ) { let now = Date() self.metadata = MessageMetadata( diff --git a/Sources/tbDEX/Protocol/Models/Messages/Close.swift b/Sources/tbDEX/Protocol/Models/Messages/Close.swift index 12c954f..d6c7cc4 100644 --- a/Sources/tbDEX/Protocol/Models/Messages/Close.swift +++ b/Sources/tbDEX/Protocol/Models/Messages/Close.swift @@ -9,7 +9,7 @@ public struct CloseData: MessageData { /// An explanation of why the exchange is being closed/completed public let reason: String? - + /// Returns the MessageKind of close public func kind() -> MessageKind { return .close diff --git a/Sources/tbDEX/Protocol/Models/Messages/RFQ.swift b/Sources/tbDEX/Protocol/Models/Messages/RFQ.swift index da56669..b878a19 100644 --- a/Sources/tbDEX/Protocol/Models/Messages/RFQ.swift +++ b/Sources/tbDEX/Protocol/Models/Messages/RFQ.swift @@ -11,8 +11,8 @@ extension RFQ { to: String, from: String, data: RFQData, - externalID: String?, - `protocol`: String? + externalID: String? = nil, + `protocol`: String? = nil ) { let id = TypeID(prefix: data.kind().rawValue)! self.metadata = MessageMetadata( diff --git a/Tests/tbDEXTests/Protocol/Models/Messages/CloseTests.swift b/Tests/tbDEXTests/Protocol/Models/Messages/CloseTests.swift index 72076f2..d044654 100644 --- a/Tests/tbDEXTests/Protocol/Models/Messages/CloseTests.swift +++ b/Tests/tbDEXTests/Protocol/Models/Messages/CloseTests.swift @@ -27,7 +27,6 @@ final class CloseTests: XCTestCase { data: .init( reason: "test reason" ), - externalID: nil, protocol: "2.0" ) @@ -66,9 +65,7 @@ final class CloseTests: XCTestCase { exchangeID: "exchange_123", data: .init( reason: "test reason" - ), - externalID: nil, - protocol: nil + ) ) } } diff --git a/Tests/tbDEXTests/Protocol/Models/Messages/OrderStatusTests.swift b/Tests/tbDEXTests/Protocol/Models/Messages/OrderStatusTests.swift index f2a3a89..095f1b0 100644 --- a/Tests/tbDEXTests/Protocol/Models/Messages/OrderStatusTests.swift +++ b/Tests/tbDEXTests/Protocol/Models/Messages/OrderStatusTests.swift @@ -26,7 +26,6 @@ final class OrderStatusTests: XCTestCase { data: .init( orderStatus: "test status" ), - externalID: nil, protocol: "2.0" ) @@ -65,9 +64,7 @@ final class OrderStatusTests: XCTestCase { exchangeID: "exchange_123", data: .init( orderStatus: "test status" - ), - externalID: nil, - protocol: nil + ) ) } } diff --git a/Tests/tbDEXTests/Protocol/Models/Messages/OrderTests.swift b/Tests/tbDEXTests/Protocol/Models/Messages/OrderTests.swift index 41316f5..9e4fa8f 100644 --- a/Tests/tbDEXTests/Protocol/Models/Messages/OrderTests.swift +++ b/Tests/tbDEXTests/Protocol/Models/Messages/OrderTests.swift @@ -23,7 +23,6 @@ final class OrderTests: XCTestCase { to: pfi.uri, exchangeID: "exchange_123", data: .init(), - externalID: nil, protocol: "2.0" ) @@ -60,9 +59,7 @@ final class OrderTests: XCTestCase { from: from, to: to, exchangeID: "exchange_123", - data: .init(), - externalID: nil, - protocol: nil + data: .init() ) } } diff --git a/Tests/tbDEXTests/Protocol/Models/Messages/QuoteTests.swift b/Tests/tbDEXTests/Protocol/Models/Messages/QuoteTests.swift index feda499..b8e6f37 100644 --- a/Tests/tbDEXTests/Protocol/Models/Messages/QuoteTests.swift +++ b/Tests/tbDEXTests/Protocol/Models/Messages/QuoteTests.swift @@ -49,7 +49,6 @@ final class QuoteTests: XCTestCase { fee: "0.50" ) ), - externalID: nil, protocol: "2.0" ) @@ -102,9 +101,7 @@ final class QuoteTests: XCTestCase { amount: "2.00", fee: "0.50" ) - ), - externalID: nil, - protocol: nil + ) ) } } diff --git a/Tests/tbDEXTests/Protocol/Models/Messages/RFQTests.swift b/Tests/tbDEXTests/Protocol/Models/Messages/RFQTests.swift index 2c1399c..25579a9 100644 --- a/Tests/tbDEXTests/Protocol/Models/Messages/RFQTests.swift +++ b/Tests/tbDEXTests/Protocol/Models/Messages/RFQTests.swift @@ -38,7 +38,6 @@ final class RFQTests: XCTestCase { ), claims: [] ), - externalID: nil, protocol: "2.0" ) @@ -82,9 +81,7 @@ final class RFQTests: XCTestCase { kind: "BITCOIN_ADDRESS" ), claims: [] - ), - externalID: nil, - protocol: nil + ) ) } }