fix kms tests

WalletConnect · May 27, 2024 · d820c4a · d820c4a
1 parent c664759
commit d820c4a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Tests/WalletConnectKMSTests/EnvelopeTests.swift b/Tests/WalletConnectKMSTests/EnvelopeTests.swift
@@ -6,16 +6,16 @@ final class EnvelopeTests: XCTestCase {
     let sealbox = Data(base64Encoded: "V2FsbGV0Q29ubmVjdA==")!
 
     func testSerialisation() {
-        let envelope = Envelope(type: .type1(pubKey: pubKey), sealbox: sealbox)
+        let envelope = Envelope(type: .type1(pubKey: pubKey), sealbox: sealbox, codingType: .base64Encoded)
         let serialised = envelope.serialised()
-        let deserialised = try! Envelope(.base64Encoded(serialised))
+        let deserialised = try! Envelope(.base64Encoded, envelopeString: serialised)
         XCTAssertEqual(envelope, deserialised)
     }
 
     func testDeserialise() {
         let serialised = "AnsibWV0aG9kIjoid2Nfc2Vzc2lvbkF1dGhlbnRpY2F0ZSIsImlkIjoxNzEyMjIwNjg1NjM1MzAzLCJqc29ucnBjIjoiMi4wIiwicGFyYW1zIjp7ImV4cGlyeVRpbWVzdGFtcCI6MTcxMjIyNDI4NSwiYXV0aFBheWxvYWQiOnsidHlwZSI6ImVpcDQzNjEiLCJzdGF0ZW1lbnQiOiJJIGFjY2VwdCB0aGUgU2VydmljZU9yZyBUZXJtcyBvZiBTZXJ2aWNlOiBodHRwczpcL1wvYXBwLndlYjNpbmJveC5jb21cL3RvcyIsImNoYWlucyI6WyJlaXAxNTU6MSIsImVpcDE1NToxMzciXSwicmVzb3VyY2VzIjpbInVybjpyZWNhcDpleUpoZEhRaU9uc2laV2x3TVRVMUlqcDdJbkpsY1hWbGMzUXZjR1Z5YzI5dVlXeGZjMmxuYmlJNlczdDlYWDE5ZlE9PSJdLCJkb21haW4iOiJhcHAud2ViM2luYm94IiwidmVyc2lvbiI6IjEiLCJhdWQiOiJodHRwczpcL1wvYXBwLndlYjNpbmJveC5jb21cL2xvZ2luIiwibm9uY2UiOiIzMjg5MTc1NiIsImlhdCI6IjIwMjQtMDQtMDRUMDg6NTE6MjVaIn0sInJlcXVlc3RlciI6eyJwdWJsaWNLZXkiOiIxOWYzNmY1N2M1NjYxNDY4ODk0NmU3MzliNzY4NmE2ZmE1OGNiZWFmOGQ3MzZmM2EzZDI2NjVlM2NlYmE4ZDQ5IiwibWV0YWRhdGEiOnsicmVkaXJlY3QiOnsibmF0aXZlIjoid2NkYXBwOlwvXC8iLCJ1bml2ZXJzYWwiOiJ3d3cud2FsbGV0Y29ubmVjdC5jb21cL2RhcHAifSwiaWNvbnMiOlsiaHR0cHM6XC9cL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tXC91XC8zNzc4NDg4NiJdLCJkZXNjcmlwdGlvbiI6IldhbGxldENvbm5lY3QgREFwcCBzYW1wbGUiLCJ1cmwiOiJ3YWxsZXQuY29ubmVjdCIsIm5hbWUiOiJTd2lmdCBEYXBwIn19fX0"
 
-        let deserialised = try! Envelope(.base64UrlEncoded(serialised))
+        let deserialised = try! Envelope(.base64UrlEncoded, envelopeString: serialised)
         XCTAssertEqual(deserialised.type, .type2)
     }
 

diff --git a/Tests/WalletConnectKMSTests/SerialiserTests.swift b/Tests/WalletConnectKMSTests/SerialiserTests.swift
@@ -23,7 +23,7 @@ final class SerializerTests: XCTestCase {
         _ = try! myKms.createSymmetricKey(topic)
         let messageToSerialize = "todo - change for request object"
         let serializedMessage = try! mySerializer.serialize(topic: topic, encodable: messageToSerialize, envelopeType: .type0)
-        let (deserializedMessage, _, _): (String, String?, Data) = mySerializer.tryDeserialize(topic: topic, codingType: .base64Encoded(serializedMessage))!
+        let (deserializedMessage, _, _): (String, String?, Data) = mySerializer.tryDeserialize(topic: topic, codingType: .base64Encoded, envelopeString: serializedMessage)!
         XCTAssertEqual(messageToSerialize, deserializedMessage)
     }
 
@@ -39,7 +39,7 @@ final class SerializerTests: XCTestCase {
         let serializedMessage = try! peerSerializer.serialize(topic: topic, encodable: messageToSerialize, envelopeType: .type1(pubKey: peerPubKey.rawRepresentation))
         print(agreementKeys.sharedKey.hexRepresentation)
         // -----------Me Deserialising -------------------
-        let (deserializedMessage, _, _): (String, String?, Data) = mySerializer.tryDeserialize(topic: topic, codingType: .base64Encoded(serializedMessage))!
+        let (deserializedMessage, _, _): (String, String?, Data) = mySerializer.tryDeserialize(topic: topic, codingType: .base64Encoded, envelopeString: serializedMessage)!
         XCTAssertEqual(messageToSerialize, deserializedMessage)
     }
 
@@ -54,7 +54,7 @@ final class SerializerTests: XCTestCase {
         }
 
         // Deserialize the serialized message back into the original object
-        guard let (deserializedMessage, _, _): (String, String?, Data) = mySerializer.tryDeserialize(topic: "", codingType: .base64UrlEncoded(serializedMessage)) else {
+        guard let (deserializedMessage, _, _): (String, String?, Data) = mySerializer.tryDeserialize(topic: "", codingType: .base64UrlEncoded, envelopeString: serializedMessage) else {
             XCTFail("Deserialization failed for Type 2 envelope.")
             return
         }
@@ -75,7 +75,7 @@ final class SerializerTests: XCTestCase {
         _ = try! myKms.createSymmetricKey(topic)
         let serialized = try! mySerializer.serialize(topic: topic, encodable: request, envelopeType: .type0)
 
-        if let result = mySerializer.tryDeserializeRequestOrResponse(topic: topic, codingType: .base64Encoded(serialized)) {
+        if let result = mySerializer.tryDeserializeRequestOrResponse(topic: topic, codingType: .base64Encoded, envelopeString: serialized) {
             switch result {
             case .left(let result):
                 XCTAssertEqual(result.request.method, request.method)
@@ -96,7 +96,7 @@ final class SerializerTests: XCTestCase {
         _ = try! myKms.createSymmetricKey(topic)
         let serialized = try! mySerializer.serialize(topic: topic, encodable: response, envelopeType: .type0)
 
-        if let result = mySerializer.tryDeserializeRequestOrResponse(topic: topic, codingType: .base64Encoded(serialized)) {
+        if let result = mySerializer.tryDeserializeRequestOrResponse(topic: topic, codingType: .base64Encoded, envelopeString: serialized) {
             switch result {
             case .right(let result):
                 XCTAssertEqual(result.response, response)
@@ -115,7 +115,7 @@ final class SerializerTests: XCTestCase {
         // Assuming serialize can accept invalidData for the purpose of this test
         let serialized = try! mySerializer.serialize(topic: topic, encodable: invalidData, envelopeType: .type0)
 
-        let result = mySerializer.tryDeserializeRequestOrResponse(topic: topic, codingType: .base64Encoded(serialized))
+        let result = mySerializer.tryDeserializeRequestOrResponse(topic: topic, codingType: .base64Encoded, envelopeString: serialized)
         XCTAssertNil(result, "Deserialization should fail for invalid data")
     }