undo signature changes

iden3 · Apr 9, 2024 · d421560 · d421560
1 parent 9e2694e
commit d421560
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/circuits/atomicMtpV2.ts b/src/circuits/atomicMtpV2.ts
@@ -3,7 +3,7 @@ import { Resolvers } from '@lib/state/resolver';
 import { checkQueryV2Circuits, ClaimOutputs, Query } from '@lib/circuits/query';
 import { PubSignalsVerifier, VerifyOpts } from '@lib/circuits/registry';
 import { IDOwnershipPubSignals } from '@lib/circuits/ownershipVerifier';
-import { checkIssuerNonRevState, checkIssuerState, getResolverByID } from '@lib/circuits/common';
+import { checkIssuerNonRevState, checkUserState, getResolverByID } from '@lib/circuits/common';
 import { DocumentLoader } from '@iden3/js-jsonld-merklization';
 import {
   AtomicQueryMTPV2PubSignals,
@@ -75,7 +75,7 @@ export class AtomicQueryMTPV2PubSignalsVerifier
       throw new Error(`resolver not found for issuerID ${this.pubSignals.issuerID.string()}`);
     }
 
-    await checkIssuerState(
+    await checkUserState(
       resolver,
       this.pubSignals.issuerID,
       this.pubSignals.issuerClaimIdenState

diff --git a/src/circuits/atomicSigV2.ts b/src/circuits/atomicSigV2.ts
@@ -2,7 +2,7 @@ import { PubSignalsVerifier, VerifyOpts } from '@lib/circuits/registry';
 import { checkQueryV2Circuits, ClaimOutputs, Query } from '@lib/circuits/query';
 import { Resolvers } from '@lib/state/resolver';
 import { IDOwnershipPubSignals } from '@lib/circuits/ownershipVerifier';
-import { checkIssuerNonRevState, checkIssuerState, getResolverByID } from '@lib/circuits/common';
+import { checkIssuerNonRevState, checkUserState, getResolverByID } from '@lib/circuits/common';
 import { getDateFromUnixTimestamp } from '@iden3/js-iden3-core';
 import { DocumentLoader } from '@iden3/js-jsonld-merklization';
 import {
@@ -68,7 +68,7 @@ export class AtomicQuerySigV2PubSignalsVerifier
       throw new Error(`resolver not found for issuerID ${this.pubSignals.issuerID.string()}`);
     }
 
-    await checkIssuerState(resolver, this.pubSignals.issuerID, this.pubSignals.issuerAuthState);
+    await checkUserState(resolver, this.pubSignals.issuerID, this.pubSignals.issuerAuthState);
 
     if (this.pubSignals.isRevocationChecked === 0) {
       return;

diff --git a/src/circuits/atomicV3.ts b/src/circuits/atomicV3.ts
@@ -2,7 +2,7 @@ import { PubSignalsVerifier, VerifyOpts } from '@lib/circuits/registry';
 import { ClaimOutputs, Query } from '@lib/circuits/query';
 import { Resolvers } from '@lib/state/resolver';
 import { IDOwnershipPubSignals } from '@lib/circuits/ownershipVerifier';
-import { checkIssuerNonRevState, checkIssuerState, getResolverByID } from '@lib/circuits/common';
+import { checkIssuerNonRevState, checkUserState, getResolverByID } from '@lib/circuits/common';
 import { DID, getDateFromUnixTimestamp } from '@iden3/js-iden3-core';
 import { DocumentLoader, getDocumentLoader } from '@iden3/js-jsonld-merklization';
 import {
@@ -194,7 +194,7 @@ export class AtomicQueryV3PubSignalsVerifier
       throw new Error(`resolver not found for issuerID ${this.pubSignals.issuerID.string()}`);
     }
 
-    await checkIssuerState(resolver, this.pubSignals.issuerID, this.pubSignals.issuerState);
+    await checkUserState(resolver, this.pubSignals.issuerID, this.pubSignals.issuerState);
 
     if (this.pubSignals.isRevocationChecked === 0) {
       return;

diff --git a/src/circuits/common.ts b/src/circuits/common.ts
@@ -5,13 +5,13 @@ import { Hash } from '@iden3/js-merkletree';
 export const issuerStateError = new Error(`issuer state is not valid`);
 export const gistStateError = new Error(`gist state is not valid`);
 
-export async function checkIssuerState(
+export async function checkUserState(
   resolver: IStateResolver,
   userId: Id,
   userState: Hash
-): Promise<void> {
+): Promise<ResolvedState> {
   try {
-    await resolver.resolve(userId.bigInt(), userState.bigInt());
+    return await resolver.resolve(userId.bigInt(), userState.bigInt());
   } catch {
     throw issuerStateError;
   }

diff --git a/test/common.test.ts b/test/common.test.ts
@@ -1,5 +1,5 @@
 import { DID } from '@iden3/js-iden3-core';
-import { checkIssuerState } from '@lib/circuits/common';
+import { checkUserState } from '@lib/circuits/common';
 import { mockResolverWithNoStateInContract, mockResolverWithNotLatesState } from './mocks';
 import { Hash } from '@iden3/js-merkletree';
 
@@ -9,12 +9,12 @@ describe('Common', () => {
   const hash = Hash.fromBigInt(
     BigInt('13483594486393726782589954979757194488582220051583949915340451442108840786819')
   );
-  it('checkIssuerState fails', async () => {
+  it('checkUserState fails', async () => {
     await expect(
-      checkIssuerState(mockResolverWithNoStateInContract, issuerID, hash)
+      checkUserState(mockResolverWithNoStateInContract, issuerID, hash)
     ).rejects.toThrow('issuer state is not valid');
   });
-  it('checkIssuerState', async () => {
-    await checkIssuerState(mockResolverWithNotLatesState, issuerID, hash);
+  it('checkUserState', async () => {
+    await checkUserState(mockResolverWithNotLatesState, issuerID, hash);
   });
 });