Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
dms3
go-merkledag
Commits
c053e4d7
Commit
c053e4d7
authored
Mar 24, 2017
by
Jeromy
Committed by
Jakub Sztandera
Apr 20, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bubble up updates from go-multihash changes
License: MIT Signed-off-by:
Jeromy
<
jeromyj@gmail.com
>
parent
ebae4323
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
20 additions
and
20 deletions
+20
-20
coding.go
coding.go
+2
-2
merkledag.go
merkledag.go
+3
-3
merkledag_test.go
merkledag_test.go
+3
-3
node.go
node.go
+3
-3
node_test.go
node_test.go
+1
-1
raw.go
raw.go
+3
-3
traverse/traverse.go
traverse/traverse.go
+1
-1
traverse/traverse_test.go
traverse/traverse_test.go
+1
-1
utils/diff.go
utils/diff.go
+1
-1
utils/utils.go
utils/utils.go
+1
-1
utils/utils_test.go
utils/utils_test.go
+1
-1
No files found.
coding.go
View file @
c053e4d7
...
...
@@ -6,8 +6,8 @@ import (
pb
"github.com/ipfs/go-ipfs/merkledag/pb"
cid
"gx/ipfs/Qm
V5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk
/go-cid"
node
"gx/ipfs/Qm
YDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7
/go-ipld-
node
"
cid
"gx/ipfs/Qm
YhQaCYEcaPPjxJX7YcPcVKkQfRy6sJ7B3XmGFk82XYdQ
/go-cid"
node
"gx/ipfs/Qm
b3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck
/go-ipld-
format
"
)
// for now, we use a PBNode intermediate thing.
...
...
merkledag.go
View file @
c053e4d7
...
...
@@ -11,10 +11,10 @@ import (
bserv
"github.com/ipfs/go-ipfs/blockservice"
offline
"github.com/ipfs/go-ipfs/exchange/offline"
ipldcbor
"gx/ipfs/QmNrbCt8j9DT5W9Pmjy2SdudT9k8GpaDr4sRuFix3BXhgR/go-ipld-cbor"
logging
"gx/ipfs/QmSpJByNKFX1sCsHBEp3R73FL4NF6FnQTEGyNAXHm2GS52/go-log"
cid
"gx/ipfs/QmV5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid"
node
"gx/ipfs/QmYDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7/go-ipld-node"
ipldcbor
"gx/ipfs/QmdaC21UyoyN3t9QdapHZfsaUo3mqVf5p4CEuFaYVFqwap/go-ipld-cbor"
cid
"gx/ipfs/QmYhQaCYEcaPPjxJX7YcPcVKkQfRy6sJ7B3XmGFk82XYdQ/go-cid"
node
"gx/ipfs/Qmb3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck/go-ipld-format"
)
var
log
=
logging
.
Logger
(
"merkledag"
)
...
...
merkledag_test.go
View file @
c053e4d7
...
...
@@ -24,9 +24,9 @@ import (
dstest
"github.com/ipfs/go-ipfs/merkledag/test"
uio
"github.com/ipfs/go-ipfs/unixfs/io"
cid
"gx/ipfs/Qm
V5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid
"
node
"gx/ipfs/QmY
DscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7/go-ipld-node
"
u
"gx/ipfs/Qm
ZuY8aV7zbNXVy6DyN9SmnuH3o9nG852F4aTiSBpts8d1/go-ipfs-util
"
u
"gx/ipfs/Qm
Wbjfz3u6HkAdPh34dgPchGbQjob6LXLhAeCGii2TX69n/go-ipfs-util
"
cid
"gx/ipfs/QmY
hQaCYEcaPPjxJX7YcPcVKkQfRy6sJ7B3XmGFk82XYdQ/go-cid
"
node
"gx/ipfs/Qm
b3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck/go-ipld-format
"
)
func
TestNode
(
t
*
testing
.
T
)
{
...
...
node.go
View file @
c053e4d7
...
...
@@ -5,9 +5,9 @@ import (
"encoding/json"
"fmt"
cid
"gx/ipfs/QmV
5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid
"
node
"gx/ipfs/QmY
DscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7/go-ipld-node
"
mh
"gx/ipfs/Qmb
Z6Cee2uHjG7hf19qLHppgKDRtaG4CVtMzdmK9VCVqLu/go-multihash
"
mh
"gx/ipfs/QmV
GtdTZdTFaLsaj2RwdVG8jcjNNcp1DE914DKZ2kHmXHw/go-multihash
"
cid
"gx/ipfs/QmY
hQaCYEcaPPjxJX7YcPcVKkQfRy6sJ7B3XmGFk82XYdQ/go-cid
"
node
"gx/ipfs/Qmb
3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck/go-ipld-format
"
)
var
ErrNotProtobuf
=
fmt
.
Errorf
(
"expected protobuf dag node"
)
...
...
node_test.go
View file @
c053e4d7
...
...
@@ -8,7 +8,7 @@ import (
.
"github.com/ipfs/go-ipfs/merkledag"
mdtest
"github.com/ipfs/go-ipfs/merkledag/test"
node
"gx/ipfs/Qm
YDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7
/go-ipld-
node
"
node
"gx/ipfs/Qm
b3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck
/go-ipld-
format
"
)
func
TestRemoveLink
(
t
*
testing
.
T
)
{
...
...
raw.go
View file @
c053e4d7
...
...
@@ -3,9 +3,9 @@ package merkledag
import
(
"github.com/ipfs/go-ipfs/blocks"
cid
"gx/ipfs/Qm
V5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk/go-cid
"
node
"gx/ipfs/QmY
DscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7/go-ipld-node
"
u
"gx/ipfs/Qm
ZuY8aV7zbNXVy6DyN9SmnuH3o9nG852F4aTiSBpts8d1/go-ipfs-util
"
u
"gx/ipfs/Qm
Wbjfz3u6HkAdPh34dgPchGbQjob6LXLhAeCGii2TX69n/go-ipfs-util
"
cid
"gx/ipfs/QmY
hQaCYEcaPPjxJX7YcPcVKkQfRy6sJ7B3XmGFk82XYdQ/go-cid
"
node
"gx/ipfs/Qm
b3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck/go-ipld-format
"
)
type
RawNode
struct
{
...
...
traverse/traverse.go
View file @
c053e4d7
...
...
@@ -5,7 +5,7 @@ import (
"context"
"errors"
node
"gx/ipfs/Qm
YDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7
/go-ipld-
node
"
node
"gx/ipfs/Qm
b3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck
/go-ipld-
format
"
)
// Order is an identifier for traversal algorithm orders
...
...
traverse/traverse_test.go
View file @
c053e4d7
...
...
@@ -8,7 +8,7 @@ import (
mdag
"github.com/ipfs/go-ipfs/merkledag"
mdagtest
"github.com/ipfs/go-ipfs/merkledag/test"
node
"gx/ipfs/Qm
YDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7
/go-ipld-
node
"
node
"gx/ipfs/Qm
b3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck
/go-ipld-
format
"
)
func
TestDFSPreNoSkip
(
t
*
testing
.
T
)
{
...
...
utils/diff.go
View file @
c053e4d7
...
...
@@ -7,7 +7,7 @@ import (
dag
"github.com/ipfs/go-ipfs/merkledag"
context
"context"
cid
"gx/ipfs/Qm
V5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk
/go-cid"
cid
"gx/ipfs/Qm
YhQaCYEcaPPjxJX7YcPcVKkQfRy6sJ7B3XmGFk82XYdQ
/go-cid"
)
const
(
...
...
utils/utils.go
View file @
c053e4d7
...
...
@@ -12,7 +12,7 @@ import (
ds
"gx/ipfs/QmRWDav6mzWseLWeYfVd5fvUKiVe9xNH29YfMF438fG364/go-datastore"
syncds
"gx/ipfs/QmRWDav6mzWseLWeYfVd5fvUKiVe9xNH29YfMF438fG364/go-datastore/sync"
node
"gx/ipfs/Qm
YDscK7dmdo2GZ9aumS8s5auUUAH5mR1jvj5pYhWusfK7
/go-ipld-
node
"
node
"gx/ipfs/Qm
b3Hm9QDFmfYuET4pu7Kyg8JV78jFa1nvZx5vnCZsK4ck
/go-ipld-
format
"
)
type
Editor
struct
{
...
...
utils/utils_test.go
View file @
c053e4d7
...
...
@@ -8,7 +8,7 @@ import (
path
"github.com/ipfs/go-ipfs/path"
context
"context"
cid
"gx/ipfs/Qm
V5gPoRsjN1Gid3LMdNZTyfCtP2DsvqEbMAmz82RmmiGk
/go-cid"
cid
"gx/ipfs/Qm
YhQaCYEcaPPjxJX7YcPcVKkQfRy6sJ7B3XmGFk82XYdQ
/go-cid"
)
func
TestAddLink
(
t
*
testing
.
T
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment