Fix warnings (#115)

Signed-off-by: conanoc <conanoc@gmail.com>
hyperledger · Jun 12, 2024 · e9e3b2b · e9e3b2b
1 parent 3881418
commit e9e3b2b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 14 deletions.
diff --git a/BasicTests.xctestplan b/BasicTests.xctestplan
@@ -15,6 +15,7 @@
     {
       "skippedTests" : [
         "AgentTest",
+        "ConnectionlessExchangeTest",
         "CredentialsTest",
         "LedgerServiceTest",
         "OobTest\/testCreateWithOfferCredentialMessage()",

diff --git a/Sources/AriesFramework/agent/MessageReceiver.swift b/Sources/AriesFramework/agent/MessageReceiver.swift
@@ -62,17 +62,12 @@ public class MessageReceiver {
     }
 
     func findConnectionByMessageThreadId(message: AgentMessage) async throws -> ConnectionRecord? {
-        guard let pthId = message.thread?.parentThreadId else {
+        guard let pthId = message.thread?.parentThreadId,
+              let oobRecord = try await agent.outOfBandService.findByInvitationId(pthId),
+              let invitationKey = try oobRecord.outOfBandInvitation.invitationKey() else {
             return nil
         }
-        guard let oobRecord = try await agent.outOfBandService.findByInvitationId(pthId) else {
-            return nil
-        }
-        guard let invitationKey = try oobRecord.outOfBandInvitation.invitationKey() else {
-            return nil
-        }
-        let connection = await agent.connectionService.findByInvitationKey(invitationKey)
-        return connection
+        return await agent.connectionService.findByInvitationKey(invitationKey)
     }
 
     func updateConnectionTheirDidDoc(_ connection: inout ConnectionRecord, senderKey: String?) async throws {
@@ -86,7 +81,7 @@ public class MessageReceiver {
             recipientKeys: [senderKey]
         ).asDidDocService()
 
-        var theirDidDoc = DidDoc(
+        let theirDidDoc = DidDoc(
             id: senderKey,
             publicKey: [],
             service: [service],

diff --git a/Sources/AriesFramework/connection/JwsService.swift b/Sources/AriesFramework/connection/JwsService.swift
@@ -70,7 +70,7 @@ public class JwsService {
               let protected = try JSONSerialization.jsonObject(with: protectedJson) as? [String: Any],
               let signature = Data(base64Encoded: firstSig.signature.base64urlToBase64()),
               let jwk = protected["jwk"] else {
-            throw AriesFrameworkError.frameworkError("Invalid Jws: \(firstSig)")
+            throw AriesFrameworkError.frameworkError("Invalid Jws: \(String(describing: firstSig))")
         }
         let jwkData = try JSONSerialization.data(withJSONObject: jwk)
         let jwkString = String(data: jwkData, encoding: .utf8)!

diff --git a/Sources/AriesFramework/oob/OutOfBandCommand.swift b/Sources/AriesFramework/oob/OutOfBandCommand.swift
@@ -104,7 +104,7 @@ public class OutOfBandCommand {
             }
         }
 
-        var outOfBandRecord = OutOfBandRecord(
+        let outOfBandRecord = OutOfBandRecord(
             id: OutOfBandRecord.generateId(),
             createdAt: Date(),
             outOfBandInvitation: outOfBandInvitation,

diff --git a/Sources/AriesFramework/proofs/ProofService.swift b/Sources/AriesFramework/proofs/ProofService.swift
@@ -37,7 +37,7 @@ public class ProofService {
         let message = RequestPresentationMessage(comment: comment, requestPresentationAttachments: [attachment])
 
         let proofRecord = ProofExchangeRecord(
-            connectionId: connectionRecord?.id ?? "proof-request",
+            connectionId: connectionRecord?.id ?? "connectionless-proof-request",
             threadId: message.threadId,
             state: .RequestSent,
             autoAcceptProof: autoAcceptProof)
@@ -132,7 +132,6 @@ public class ProofService {
     */
     public func processPresentation(messageContext: InboundMessageContext) async throws -> ProofExchangeRecord {
         let presentationMessage = try JSONDecoder().decode(PresentationMessage.self, from: Data(messageContext.plaintextMessage.utf8))
-        let connection = try messageContext.assertReadyConnection()
 
         var proofRecord = try await agent.proofRepository.getByThreadAndConnectionId(
             threadId: presentationMessage.threadId,