diff --git a/Trust/Market/OrdersRequest.swift b/Trust/Market/OrdersRequest.swift index 65bd2ff70..26843f6b5 100644 --- a/Trust/Market/OrdersRequest.swift +++ b/Trust/Market/OrdersRequest.swift @@ -68,32 +68,23 @@ public class OrdersRequest { //TODO get encoding for count and start let query: String = baseURL + "public-key/" + publicKey + "?start=" + signedOrders[0].order.start.description + ";count=" + signedOrders[0].order.count.description - var data = signedOrders[0].message + var hexMessageData = signedOrders[0].message + print(query) for i in 0...signedOrders.count - 1 { for j in 0...64 { - data.append(signedOrders[i].signature.hexa2Bytes[j]) + hexMessageData.append(signedOrders[i].signature.hexa2Bytes[j]) } } - let parameters: Parameters = ["data": data] - let headers: HTTPHeaders = ["Content-Type": "application/vnd.awallet-signed-orders-v0"] - - Alamofire.request(query, method: .put, - parameters: parameters, - encoding: JSONEncoding.default, - headers: headers).responseJSON { response in - print("Request: \(String(describing: response.request))") // original url request - print("Response: \(String(describing: response.response))") // http url response - print("Result: \(response.result)") // response serialization result + print(hexMessageData) - if let json = response.result.value { - let parsedJSON = try! JSON(parseJSON: (json as! String)) - callback(parsedJSON["orders"]["accepted"]) - } + let headers: HTTPHeaders = ["Content-Type": "application/vnd.awallet-signed-orders-v0"] + Alamofire.upload(Data(bytes: hexMessageData), to: query, method: .put, headers: headers).response { response in if let data = response.data, let utf8Text = String(data: data, encoding: .utf8) { print("Data: \(utf8Text)") // original server data as UTF8 string + callback(data.hexEncoded) } } } diff --git a/TrustTests/Market/OrderRequestTest.swift b/TrustTests/Market/OrderRequestTest.swift index fef230713..33c6b7baf 100644 --- a/TrustTests/Market/OrderRequestTest.swift +++ b/TrustTests/Market/OrderRequestTest.swift @@ -37,7 +37,7 @@ class OrderRequestTest : XCTestCase { price: BigUInt("100000")!, indices: indices, expiry: BigUInt(String(ts))!, - contractAddress: "007bee82bdd9e866b2bd114780a47f2261c684e3", + contractAddress: "bC9a1026A4BC6F0BA8Bbe486d1D09dA5732B39e4".lowercased(), start: BigUInt("500000210121213")!, count: 3 )