Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move ErrNotFound from internal to pkg #81

Merged
merged 1 commit into from
Sep 24, 2024
Merged

Move ErrNotFound from internal to pkg #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions go-sdk/internal/sparse-merkle-tree/smt/merkletree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import (

"github.com/hyperledger-labs/zeto/go-sdk/internal/log"
"github.com/hyperledger-labs/zeto/go-sdk/internal/sparse-merkle-tree/node"
"github.com/hyperledger-labs/zeto/go-sdk/internal/sparse-merkle-tree/storage"
"github.com/hyperledger-labs/zeto/go-sdk/internal/sparse-merkle-tree/utils"
"github.com/hyperledger-labs/zeto/go-sdk/pkg/sparse-merkle-tree/core"
)
Expand All @@ -46,7 +45,7 @@ func NewMerkleTree(db core.Storage, maxLevels int) (core.SparseMerkleTree, error
mt := sparseMerkleTree{db: db, maxLevels: maxLevels}

root, err := mt.db.GetRootNodeIndex()
if err == storage.ErrNotFound {
if err == core.ErrNotFound {
mt.rootKey = node.ZERO_INDEX
err = mt.db.UpsertRootNodeIndex(mt.rootKey)
if err != nil {
Expand Down
3 changes: 1 addition & 2 deletions go-sdk/internal/sparse-merkle-tree/smt/merkletree_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"fmt"
"testing"

"github.com/hyperledger-labs/zeto/go-sdk/internal/sparse-merkle-tree/storage"
"github.com/hyperledger-labs/zeto/go-sdk/pkg/sparse-merkle-tree/core"
"github.com/stretchr/testify/assert"
)
Expand All @@ -33,7 +32,7 @@ func (ms *mockStorage) GetRootNodeIndex() (core.NodeIndex, error) {
if ms.GetRootNodeIndex_customError {
return nil, fmt.Errorf("nasty error in get root")
}
return nil, storage.ErrNotFound
return nil, core.ErrNotFound
}
func (ms *mockStorage) UpsertRootNodeIndex(core.NodeIndex) error {
return fmt.Errorf("nasty error in upsert root")
Expand Down
4 changes: 2 additions & 2 deletions go-sdk/internal/sparse-merkle-tree/storage/sql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (s *sqlStorage) GetRootNodeIndex() (core.NodeIndex, error) {
}
err := s.p.DB().Table(core.TreeRootsTable).First(&root).Error
if err == gorm.ErrRecordNotFound {
return nil, ErrNotFound
return nil, core.ErrNotFound
} else if err != nil {
return nil, err
}
Expand Down Expand Up @@ -121,7 +121,7 @@ func getNode(batchOrDb *gorm.DB, nodesTableName string, ref core.NodeIndex) (cor
}
err := batchOrDb.Table(nodesTableName).First(&n).Error
if err == gorm.ErrRecordNotFound {
return nil, ErrNotFound
return nil, core.ErrNotFound
} else if err != nil {
return nil, err
}
Expand Down
2 changes: 1 addition & 1 deletion ...rnal/sparse-merkle-tree/storage/errors.go → go-sdk/pkg/sparse-merkle-tree/core/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package storage
package core

import "errors"

Expand Down
Loading