rebase adjustments

Signed-off-by: Angelo De Caro <[email protected]>
hyperledger-labs · Dec 26, 2024 · 89c6f13 · 89c6f13
1 parent 59c7df4
commit 89c6f13
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.22.6
 require (
 	github.com/IBM/idemix v0.0.2-0.20240816143710-3dce4618d760
 	github.com/IBM/idemix/bccsp/types v0.0.0-20240816143710-3dce4618d760
-	github.com/IBM/mathlib v0.0.3-0.20241119052826-7fdf2555b381
+	github.com/IBM/mathlib v0.0.3-0.20241219051532-81539b287cf5
 	github.com/gin-gonic/gin v1.10.0
 	github.com/gobuffalo/packr/v2 v2.7.1
 	github.com/hashicorp/go-uuid v1.0.3

diff --git a/go.sum b/go.sum
@@ -634,8 +634,8 @@ github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20240612072411-114d281b442d h
 github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20240612072411-114d281b442d/go.mod h1:FC0vVgNI6bv8GH0VTwjup+arwJ8Tau1iEhroWZ1oPwU=
 github.com/IBM/idemix/bccsp/types v0.0.0-20240816143710-3dce4618d760 h1:4tcdWj0MONt4JtiqNESWMuWSb5rDInIFzlUSbncHlCM=
 github.com/IBM/idemix/bccsp/types v0.0.0-20240816143710-3dce4618d760/go.mod h1:4bYvi+a50aXxmHf1vwuvR+Wd8YXZ6AhT+0p5oK4xdOA=
-github.com/IBM/mathlib v0.0.3-0.20241119052826-7fdf2555b381 h1:FHobdbIHiODoLuYhuUlJvGbEKsrmolJBMxZ/18L+Z3s=
-github.com/IBM/mathlib v0.0.3-0.20241119052826-7fdf2555b381/go.mod h1:Tco9QzE3fQzjMS7nPbHDeFfydAzctStf1Pa8hsh6Hjs=
+github.com/IBM/mathlib v0.0.3-0.20241219051532-81539b287cf5 h1:wfksZZMeYfPeqsXwiotUsbnOqGGpth6t8Ij4tJ/91kw=
+github.com/IBM/mathlib v0.0.3-0.20241219051532-81539b287cf5/go.mod h1:Tco9QzE3fQzjMS7nPbHDeFfydAzctStf1Pa8hsh6Hjs=
 github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1:1G1pk05UrOh0NlF1oeaaix1x8XzrfjIDK47TY0Zehcw=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=

diff --git a/token/core/zkatdlog/crypto/math/math.go b/token/core/zkatdlog/crypto/math/math.go
@@ -18,8 +18,8 @@ type Element interface {
 	CurveID() math.CurveID
 }
 
-func CheckElements[E Element](elements []E, curveID math.CurveID, length int) error {
-	if len(elements) != length {
+func CheckElements[E Element](elements []E, curveID math.CurveID, length uint64) error {
+	if uint64(len(elements)) != length {
 		return errors.Errorf("length of elements does not match length of curveID")
 	}
 	for _, g1 := range elements {

diff --git a/token/services/db/sql/common/tokens.go b/token/services/db/sql/common/tokens.go
@@ -455,7 +455,7 @@ func (db *TokenDB) getLedgerTokenAndMeta(ctx context.Context, ids []*token.ID) (
 
 	query, err := NewSelect("tx_id, idx, ledger, ledger_type, ledger_metadata  ").From(db.table.Tokens).Where(where).Compile()
 	if err != nil {
-		return nil, nil, errors.Wrapf(err, "failed to compile query")
+		return nil, nil, nil, errors.Wrapf(err, "failed to compile query")
 	}
 	span.AddEvent("query", tracing.WithAttributes(tracing.String(QueryLabel, query)))
 	logger.Debug(query, args)