Move IndexOnly from utxo to utils

Signed-off-by: Jim Zhang <jim.zhang@kaleido.io>
hyperledger-labs · Jul 30, 2024 · 2f98169 · 2f98169
1 parent 781a434
commit 2f98169
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/zkp/golang/internal/smt/merkletree.go b/zkp/golang/internal/smt/merkletree.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/hyperledger-labs/zeto/internal/node"
 	"github.com/hyperledger-labs/zeto/internal/storage"
-	"github.com/hyperledger-labs/zeto/internal/utxo"
+	"github.com/hyperledger-labs/zeto/internal/utils"
 	"github.com/hyperledger-labs/zeto/pkg/core"
 )
 
@@ -137,7 +137,7 @@ func (mt *sparseMerkleTree) GenerateProof(k *big.Int, rootKey core.NodeIndex) (c
 				return p, value.BigInt(), nil
 			}
 			// We found a leaf whose entry didn't match the node index
-			p.existingNode, err = node.NewLeafNode(utxo.NewIndexOnly(idx))
+			p.existingNode, err = node.NewLeafNode(utils.NewIndexOnly(idx))
 			if err != nil {
 				return nil, nil, err
 			}

diff --git a/zkp/golang/internal/storage/sql.go b/zkp/golang/internal/storage/sql.go
@@ -18,7 +18,7 @@ package storage
 
 import (
 	"github.com/hyperledger-labs/zeto/internal/node"
-	"github.com/hyperledger-labs/zeto/internal/utxo"
+	"github.com/hyperledger-labs/zeto/internal/utils"
 	"github.com/hyperledger-labs/zeto/pkg/core"
 	"gorm.io/gorm"
 )
@@ -82,7 +82,7 @@ func (s *sqlStorage) GetNode(ref core.NodeIndex) (core.Node, error) {
 		if err1 != nil {
 			return nil, err1
 		}
-		v := utxo.NewIndexOnly(idx)
+		v := utils.NewIndexOnly(idx)
 		newNode, err = node.NewLeafNode(v)
 	case core.NodeTypeBranch:
 		leftChild, err1 := node.NewNodeIndexFromHex(*n.LeftChild)

diff --git a/zkp/golang/internal/utxo/indexonly.go → zkp/golang/internal/utils/indexonly.go b/zkp/golang/internal/utxo/indexonly.go → zkp/golang/internal/utils/indexonly.go
@@ -14,7 +14,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package utxo
+package utils
 
 import (
 	"github.com/hyperledger-labs/zeto/pkg/core"

diff --git a/zkp/golang/pkg/utxo/utxo.go b/zkp/golang/pkg/utxo/utxo.go
@@ -19,6 +19,7 @@ package utxo
 import (
 	"math/big"
 
+	"github.com/hyperledger-labs/zeto/internal/utils"
 	"github.com/hyperledger-labs/zeto/internal/utxo"
 	"github.com/hyperledger-labs/zeto/pkg/core"
 	"github.com/iden3/go-iden3-crypto/babyjub"
@@ -41,7 +42,7 @@ func NewNonFungibleNullifier(tokenId *big.Int, tokenUri *big.Int, owner *big.Int
 }
 
 func NewIndexOnly(index core.NodeIndex) core.Indexable {
-	return utxo.NewIndexOnly(index)
+	return utils.NewIndexOnly(index)
 }
 
 func HashTokenUri(tokenUri string) (*big.Int, error) {