refactor!: remove duplicate tests from v2-indy-oob-proof-proposal

Signed-off-by: Pritam Singh <[email protected]>
openwallet-foundation · Mar 15, 2023 · a822161 · a822161
1 parent b501b18
commit a822161
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 334 deletions.
diff --git a/packages/anoncreds/src/protocols/proofs/v1/V1ProofProtocol.ts b/packages/anoncreds/src/protocols/proofs/v1/V1ProofProtocol.ts
@@ -417,7 +417,8 @@ export class V1ProofProtocol extends BaseProofProtocol implements ProofProtocol<
     let proofRecord = await this.findByThreadAndConnectionId(agentContext, proofRequestMessage.threadId, connection?.id)
 
     if (!proofRecord) {
-      // Proof request not bound to any connection: requests_attach in OOB msg
+      // Proof request bound to a proofRecord by threadId: proof proposal in OOB msg
+      // TODO integrate with oob module
       proofRecord = await this.findByThreadAndConnectionId(messageContext.agentContext, proofRequestMessage.threadId)
       if (proofRecord) proofRecord.connectionId = connection?.id
     }

diff --git a/packages/anoncreds/src/protocols/proofs/v1/__tests__/v1-indy-proof-proposal.e2e.test.ts b/packages/anoncreds/src/protocols/proofs/v1/__tests__/v1-indy-proof-proposal.e2e.test.ts
@@ -2,7 +2,7 @@ import type { EventReplaySubject } from '../../../../../../core/tests'
 import type { AnonCredsTestsAgent } from '../../../../../tests/legacyAnonCredsSetup'
 
 import { ProofState } from '../../../../../../core/src'
-import { testLogger, waitForProofExchangeRecord } from '../../../../../../core/tests'
+import { waitForProofExchangeRecordSubject, testLogger, waitForProofExchangeRecord } from '../../../../../../core/tests'
 import { issueLegacyAnonCredsCredential, setupAnonCredsTests } from '../../../../../tests/legacyAnonCredsSetup'
 import { V1PresentationMessage, V1ProposePresentationMessage, V1RequestPresentationMessage } from '../messages'
 
@@ -166,7 +166,7 @@ describe('Present Proof', () => {
     })
     await faberAgent.oob.receiveInvitation(outOfBandInvitation)
     testLogger.test('Faber waits for proof proposal message from Alice')
-    let faberProofExchangeRecord = await waitForProofExchangeRecord(faberAgent, {
+    let faberProofExchangeRecord = await waitForProofExchangeRecordSubject(faberReplay, {
       state: ProofState.ProposalReceived,
     })
 
@@ -178,7 +178,7 @@ describe('Present Proof', () => {
 
     // ALice waits for presentation request from Faber
     testLogger.test('Alice waits for presentation request from Faber')
-    let aliceProofExchangeRecord = await waitForProofExchangeRecord(aliceAgent, {
+    let aliceProofExchangeRecord = await waitForProofExchangeRecordSubject(aliceReplay, {
       state: ProofState.RequestReceived,
     })
     expect(aliceProofExchangeRecord.connectionId).not.toBeNull()
@@ -195,7 +195,7 @@ describe('Present Proof', () => {
 
     // Faber waits for the presentation from Alice
     testLogger.test('Faber waits for presentation from Alice')
-    faberProofExchangeRecord = await waitForProofExchangeRecord(faberAgent, {
+    faberProofExchangeRecord = await waitForProofExchangeRecordSubject(faberReplay, {
       threadId: aliceProofExchangeRecord.threadId,
       state: ProofState.PresentationReceived,
     })
@@ -208,7 +208,7 @@ describe('Present Proof', () => {
 
     // Alice waits utils she received a presentation acknowledgement
     testLogger.test('Alice waits until she receives a presentation acknowledgement')
-    aliceProofExchangeRecord = await waitForProofExchangeRecord(aliceAgent, {
+    aliceProofExchangeRecord = await waitForProofExchangeRecordSubject(aliceReplay, {
       threadId: aliceProofExchangeRecord.threadId,
       state: ProofState.Done,
     })

diff --git a/packages/core/src/modules/proofs/ProofsApiOptions.ts b/packages/core/src/modules/proofs/ProofsApiOptions.ts
@@ -39,7 +39,7 @@ export interface ProposeProofOptions<PPs extends ProofProtocol[] = ProofProtocol
 }
 
 /**
- * Interface for ProofsApi.createProofProposal. Will create an out of band request.
+ * Interface for ProofsApi.createProofProposal. Will create an out of band proposal.
  */
 export interface CreateProofProposalOptions<PPs extends ProofProtocol[] = ProofProtocol[]> extends BaseOptions {
   protocolVersion: ProofsProtocolVersionType<PPs>

diff --git a/packages/core/src/modules/proofs/protocol/v2/V2ProofProtocol.ts b/packages/core/src/modules/proofs/protocol/v2/V2ProofProtocol.ts
@@ -397,7 +397,8 @@ export class V2ProofProtocol<PFs extends ProofFormatService[] = ProofFormatServi
     )
 
     if (!proofRecord) {
-      // Proof request not bound to any connection: requests_attach in OOB msg
+      // Proof request bound to a proofRecord by threadId: proof proposal in OOB msg
+      // TODO integrate with oob module
       proofRecord = await this.findByThreadAndConnectionId(messageContext.agentContext, requestMessage.threadId)
       if (proofRecord) proofRecord.connectionId = connection?.id
     }