diff options
Diffstat (limited to 'utils/merkletrie')
-rw-r--r-- | utils/merkletrie/filesystem/node.go | 6 | ||||
-rw-r--r-- | utils/merkletrie/filesystem/node_test.go | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/utils/merkletrie/filesystem/node.go b/utils/merkletrie/filesystem/node.go index fc8f191..5461bd3 100644 --- a/utils/merkletrie/filesystem/node.go +++ b/utils/merkletrie/filesystem/node.go @@ -5,7 +5,7 @@ import ( "os" "path/filepath" - "gopkg.in/src-d/go-billy.v2" + "gopkg.in/src-d/go-billy.v3" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/plumbing/filemode" "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" @@ -106,7 +106,7 @@ func (n *node) calculateChildren() error { return nil } -func (n *node) newChildNode(file billy.FileInfo) (*node, error) { +func (n *node) newChildNode(file os.FileInfo) (*node, error) { path := filepath.Join(n.path, file.Name()) hash, err := n.calculateHash(path, file) @@ -131,7 +131,7 @@ func (n *node) newChildNode(file billy.FileInfo) (*node, error) { return node, nil } -func (n *node) calculateHash(path string, file billy.FileInfo) ([]byte, error) { +func (n *node) calculateHash(path string, file os.FileInfo) ([]byte, error) { if file.IsDir() { return make([]byte, 24), nil } diff --git a/utils/merkletrie/filesystem/node_test.go b/utils/merkletrie/filesystem/node_test.go index f783c15..a383716 100644 --- a/utils/merkletrie/filesystem/node_test.go +++ b/utils/merkletrie/filesystem/node_test.go @@ -7,8 +7,8 @@ import ( "testing" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-billy.v2" - "gopkg.in/src-d/go-billy.v2/memfs" + "gopkg.in/src-d/go-billy.v3" + "gopkg.in/src-d/go-billy.v3/memfs" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/utils/merkletrie" "gopkg.in/src-d/go-git.v4/utils/merkletrie/noder" |