fix ProofType naming for V3

iden3 · Nov 20, 2023 · 0e13eb3 · 0e13eb3
1 parent dffd68a
commit 0e13eb3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/credentialAtomicQueryV3.go b/credentialAtomicQueryV3.go
@@ -14,8 +14,8 @@ import (
 type ProofType string
 
 const (
-	SigProotType ProofType = "sig"
-	MTPProofType ProofType = "mtp"
+	BJJSignatureProofType      ProofType = "BJJSignature2021"
+	Iden3SparseMerkleProofType ProofType = "Iden3SparseMerkleProof"
 )
 
 // AtomicQueryV3Inputs ZK private inputs for credentialAtomicQuerySig.circom
@@ -128,7 +128,7 @@ func (a AtomicQueryV3Inputs) Validate() error {
 	}
 
 	switch a.ProofType {
-	case SigProotType:
+	case BJJSignatureProofType:
 		if a.Claim.SignatureProof == nil {
 			return errors.New(ErrorEmptySignatureProof)
 		}
@@ -144,7 +144,7 @@ func (a AtomicQueryV3Inputs) Validate() error {
 		if a.Claim.SignatureProof.Signature == nil {
 			return errors.New(ErrorEmptyClaimSignature)
 		}
-	case MTPProofType:
+	case Iden3SparseMerkleProofType:
 		if a.Claim.IncProof == nil {
 			return errors.New(ErrorEmptyMTPProof)
 		}
@@ -217,7 +217,7 @@ func (a AtomicQueryV3Inputs) InputsMarshal() ([]byte, error) {
 	}
 
 	switch a.ProofType {
-	case SigProotType:
+	case BJJSignatureProofType:
 		s.ProofType = "1"
 
 		if a.Claim.SignatureProof == nil {
@@ -244,7 +244,7 @@ func (a AtomicQueryV3Inputs) InputsMarshal() ([]byte, error) {
 		s.IssuerAuthState = a.Claim.SignatureProof.IssuerAuthIncProof.TreeState.State
 
 		a.fillMTPProofsWithZero(&s)
-	case MTPProofType:
+	case Iden3SparseMerkleProofType:
 		s.ProofType = "2"
 
 		if a.Claim.IncProof == nil {

diff --git a/credentialAtomicQueryV3OnChain.go b/credentialAtomicQueryV3OnChain.go
@@ -184,7 +184,7 @@ func (a AtomicQueryV3OnChainInputs) Validate() error {
 	}
 
 	switch a.ProofType {
-	case SigProotType:
+	case BJJSignatureProofType:
 		if a.Claim.SignatureProof == nil {
 			return errors.New(ErrorEmptySignatureProof)
 		}
@@ -200,7 +200,7 @@ func (a AtomicQueryV3OnChainInputs) Validate() error {
 		if a.Claim.SignatureProof.Signature == nil {
 			return errors.New(ErrorEmptyClaimSignature)
 		}
-	case MTPProofType:
+	case Iden3SparseMerkleProofType:
 		if a.Claim.IncProof == nil {
 			return errors.New(ErrorEmptyMTPProof)
 		}
@@ -290,7 +290,7 @@ func (a AtomicQueryV3OnChainInputs) InputsMarshal() ([]byte, error) {
 	}
 
 	switch a.ProofType {
-	case SigProotType:
+	case BJJSignatureProofType:
 		s.ProofType = "1"
 
 		if a.Claim.SignatureProof == nil {
@@ -317,7 +317,7 @@ func (a AtomicQueryV3OnChainInputs) InputsMarshal() ([]byte, error) {
 		s.IssuerAuthState = a.Claim.SignatureProof.IssuerAuthIncProof.TreeState.State
 
 		a.fillMTPProofsWithZero(&s)
-	case MTPProofType:
+	case Iden3SparseMerkleProofType:
 		s.ProofType = "2"
 
 		if a.Claim.IncProof == nil {

diff --git a/credentialAtomicQueryV3OnChain_test.go b/credentialAtomicQueryV3OnChain_test.go
@@ -92,7 +92,7 @@ func TestAttrQueryV3OnChain_SigPart_PrepareInputs(t *testing.T) {
 			SlotIndex:  2,
 		},
 		CurrentTimeStamp:   timestamp,
-		ProofType:          SigProotType,
+		ProofType:          BJJSignatureProofType,
 		AuthClaim:          user.AuthClaim,
 		AuthClaimIncMtp:    authClaimIncMTP,
 		AuthClaimNonRevMtp: authClaimNonRevMTP,
@@ -183,7 +183,7 @@ func TestAttrQueryV3OnChain_MTPPart_PrepareInputs(t *testing.T) {
 			SlotIndex:  2,
 		},
 		CurrentTimeStamp:   timestamp,
-		ProofType:          MTPProofType,
+		ProofType:          Iden3SparseMerkleProofType,
 		AuthClaim:          user.AuthClaim,
 		AuthClaimIncMtp:    authClaimIncMTP,
 		AuthClaimNonRevMtp: authClaimNonRevMTP,

diff --git a/credentialAtomicQueryV3_test.go b/credentialAtomicQueryV3_test.go
@@ -78,7 +78,7 @@ func TestAttrQueryV3_SigPart_PrepareInputs(t *testing.T) {
 			SlotIndex:  2,
 		},
 		CurrentTimeStamp: timestamp,
-		ProofType:        SigProotType,
+		ProofType:        BJJSignatureProofType,
 		LinkNonce:        big.NewInt(0),
 		VerifierID: it.IDFromStr(
 			t, "21929109382993718606847853573861987353620810345503358891473103689157378049"),
@@ -146,7 +146,7 @@ func TestAttrQueryV3_MTPPart_PrepareInputs(t *testing.T) {
 			SlotIndex:  2,
 		},
 		CurrentTimeStamp: timestamp,
-		ProofType:        MTPProofType,
+		ProofType:        Iden3SparseMerkleProofType,
 		LinkNonce:        big.NewInt(0),
 		VerifierID: it.IDFromStr(
 			t, "21929109382993718606847853573861987353620810345503358891473103689157378049"),