@cryptotaxi247 / kubo / commits / 7406a5f1b

Extract: thirdparty/ds-help submodule

It has been moved to its own repository: * github.com/ipfs/go-ipfs-ds-help History has been preserved. It has been published with gx. Imports have been updated and re-ordered accordingly. License: MIT Signed-off-by: Hector Sanjuan <hector@protocol.ai>

Hector Sanjuan committed Feb 12, 2018 at 11:46 UTC 7406a5f1b2a9067b10908afd7fa59f9eca58cb2a
12 files changed +22 -52
blocks/blockstore/blockstore.go
+2 -3
@@ -8,14 +8,13 @@ import (
8 "sync"
9 "sync/atomic"
10
11 - dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
12 - blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
13 -
11 ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
12 dsns "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/namespace"
13 dsq "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/query"
14 logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
15 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
16 + dshelp "gx/ipfs/QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn/go-ipfs-ds-help"
17 + blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
18 )
19
20 var log = logging.Logger("blockstore")
blocks/blockstore/blockstore_test.go
+2 -3
@@ -6,14 +6,13 @@ import (
6 "fmt"
7 "testing"
8
9 - dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
10 - blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
11 -
9 u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
10 ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
11 dsq "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/query"
12 ds_sync "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/sync"
13 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
14 + dshelp "gx/ipfs/QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn/go-ipfs-ds-help"
15 + blocks "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
16 )
17
18 func TestGetWhenKeyNotPresent(t *testing.T) {
filestore/fsrefstore.go
+3 -3
@@ -9,15 +9,15 @@ import (
9
10 "github.com/ipfs/go-ipfs/blocks/blockstore"
11 pb "github.com/ipfs/go-ipfs/filestore/pb"
12 - dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
13 - posinfo "gx/ipfs/Qmb3jLEFAQrqdVgWUajqEyuuDoavkSq1XQXz6tWdFWF995/go-ipfs-posinfo"
14 - "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
12
13 ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
14 dsns "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/namespace"
15 dsq "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/query"
16 proto "gx/ipfs/QmT6n4mspWYEya864BhCUJEgyxiRfmiSY9ruQwTUNpRKaM/protobuf/proto"
17 + posinfo "gx/ipfs/Qmb3jLEFAQrqdVgWUajqEyuuDoavkSq1XQXz6tWdFWF995/go-ipfs-posinfo"
18 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
19 + dshelp "gx/ipfs/QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn/go-ipfs-ds-help"
20 + "gx/ipfs/Qmej7nf81hi2x2tvjRBF3mcp74sQyuDH4VMYDGd1YtXjb2/go-block-format"
21 )
22
23 // FilestorePrefix identifies the key prefix for FileManager blocks.
filestore/util.go
+1 -1
@@ -6,11 +6,11 @@ import (
6
7 "github.com/ipfs/go-ipfs/blocks/blockstore"
8 pb "github.com/ipfs/go-ipfs/filestore/pb"
9 - dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
9
10 ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
11 dsq "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/query"
12 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
13 + dshelp "gx/ipfs/QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn/go-ipfs-ds-help"
14 )
15
16 // Status is used to identify the state of the block data referenced
namesys/publisher.go
+1 -1
@@ -9,7 +9,6 @@ import (
9 pb "github.com/ipfs/go-ipfs/namesys/pb"
10 path "github.com/ipfs/go-ipfs/path"
11 pin "github.com/ipfs/go-ipfs/pin"
12 - dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
12 ft "github.com/ipfs/go-ipfs/unixfs"
13
14 u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
@@ -19,6 +18,7 @@ import (
18 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
19 peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
20 ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
21 + dshelp "gx/ipfs/QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn/go-ipfs-ds-help"
22 )
23
24 const PublishPutValTimeout = time.Minute
namesys/publisher_test.go
+1 -1
@@ -8,7 +8,6 @@ import (
8
9 path "github.com/ipfs/go-ipfs/path"
10 mockrouting "github.com/ipfs/go-ipfs/routing/mock"
11 - dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
11
12 ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
13 dssync "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore/sync"
@@ -16,6 +15,7 @@ import (
15 ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
16 peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
17 ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
18 + dshelp "gx/ipfs/QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn/go-ipfs-ds-help"
19 )
20
21 type identity struct {
namesys/pubsub.go
+1 -1
@@ -10,7 +10,6 @@ import (
10
11 pb "github.com/ipfs/go-ipfs/namesys/pb"
12 path "github.com/ipfs/go-ipfs/path"
13 - dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
13
14 u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
15 p2phost "gx/ipfs/QmNmJZL7FQySMtE2BQuLMuZg2EB2CLEunJJUSVSc9YnnbV/go-libp2p-host"
@@ -26,6 +25,7 @@ import (
25 mh "gx/ipfs/QmZyZDi491cCNTLfAhwcaDii2Kg4pwKRkhqQzURGDvY6ua/go-multihash"
26 ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
27 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
28 + dshelp "gx/ipfs/QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn/go-ipfs-ds-help"
29 )
30
31 // PubsubPublisher is a publisher that distributes IPNS records through pubsub
namesys/republisher/repub.go
+1 -1
@@ -9,7 +9,6 @@ import (
9 namesys "github.com/ipfs/go-ipfs/namesys"
10 pb "github.com/ipfs/go-ipfs/namesys/pb"
11 path "github.com/ipfs/go-ipfs/path"
12 - dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
12
13 ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
14 logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
@@ -20,6 +19,7 @@ import (
19 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
20 peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
21 ic "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
22 + dshelp "gx/ipfs/QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn/go-ipfs-ds-help"
23 )
24
25 var errNoEntry = errors.New("no previous entry")
package.json
+7 -1
@@ -541,10 +541,16 @@
541 "version": "0.0.1"
542 },
543 {
544 - "author": "hector",
544 + "author": "hsanjuan",
545 "hash": "QmRMGdC6HKdLsPDABL9aXPDidrpmEHzJqFWSvshkbn9Hj8",
546 "name": "go-ipfs-flags",
547 "version": "0.0.1"
548 + },
549 + {
550 + "author": "hsanjuan",
551 + "hash": "QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn",
552 + "name": "go-ipfs-ds-help",
553 + "version": "0.0.1"
554 }
555 ],
556 "gxVersion": "0.10.0",
routing/mock/centralized_client.go
+2 -3
@@ -5,19 +5,18 @@ import (
5 "errors"
6 "time"
7
8 - dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
9 - "gx/ipfs/QmVvkK7s5imCiq3JVbL3pGfnhcCnf3LrFJPF4GE2sAoGZf/go-testutil"
10 -
8 u "gx/ipfs/QmNiJuT8Ja3hMVpBHXv3Q6dwmperaQ6JjLtpMQgMCD7xvx/go-ipfs-util"
9 ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
10 logging "gx/ipfs/QmRb5jh8z2E8hMGN2tkvs1yHynUanqnZ3UeKwgN1i9P1F8/go-log"
11 routing "gx/ipfs/QmTiWLZ6Fo5j4KcTVutZJ5KWRRJrbxzmxA4td8NfEdrPh7/go-libp2p-routing"
12 dhtpb "gx/ipfs/QmUpttFinNDmNPgFwKN8sZK6BUtBmA68Y4KdSBDXa8t9sJ/go-libp2p-record/pb"
13 + "gx/ipfs/QmVvkK7s5imCiq3JVbL3pGfnhcCnf3LrFJPF4GE2sAoGZf/go-testutil"
14 ma "gx/ipfs/QmWWQ2Txc2c6tqjsBpzg5Ar652cHPGNsQQp2SejkNmkUMb/go-multiaddr"
15 pstore "gx/ipfs/QmXauCuJzmzapetmC6W4TuDJLL1yFFrVzSHoWv8YdbmnxH/go-libp2p-peerstore"
16 proto "gx/ipfs/QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV/gogo-protobuf/proto"
17 peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
18 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
19 + dshelp "gx/ipfs/QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn/go-ipfs-ds-help"
20 )
21
22 var log = logging.Logger("mockrouter")
routing/offline/offline.go
+1 -2
@@ -7,8 +7,6 @@ import (
7 "errors"
8 "time"
9
10 - dshelp "github.com/ipfs/go-ipfs/thirdparty/ds-help"
11 -
10 ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
11 routing "gx/ipfs/QmTiWLZ6Fo5j4KcTVutZJ5KWRRJrbxzmxA4td8NfEdrPh7/go-libp2p-routing"
12 record "gx/ipfs/QmUpttFinNDmNPgFwKN8sZK6BUtBmA68Y4KdSBDXa8t9sJ/go-libp2p-record"
@@ -18,6 +16,7 @@ import (
16 "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
17 ci "gx/ipfs/QmaPbCnUMBohSGo3KnxEa2bHqyJVVeEEcwtqJAYxerieBo/go-libp2p-crypto"
18 cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
19 + dshelp "gx/ipfs/QmdQTPWduSeyveSxeCAte33M592isSW5Z979g81aJphrgn/go-ipfs-ds-help"
20 )
21
22 // ErrOffline is returned when trying to perform operations that
thirdparty/ds-help/key.go deleted
-32
@@ -1,32 +0,0 @@
1 -package dshelp
2 -
3 -import (
4 - ds "gx/ipfs/QmPpegoMqhAEqjncrzArm7KVWAkCm78rqL2DPuNjhPrshg/go-datastore"
5 - cid "gx/ipfs/QmcZfnkapfECQGcLZaf9B79NRg7cRa9EnZh4LSbkCzwNvY/go-cid"
6 - base32 "gx/ipfs/QmfVj3x4D6Jkq9SEoi5n2NmoUomLwoeiwnYz2KQa15wRw6/base32"
7 -)
8 -
9 -// TODO: put this code into the go-datastore itself
10 -
11 -func NewKeyFromBinary(rawKey []byte) ds.Key {
12 - buf := make([]byte, 1+base32.RawStdEncoding.EncodedLen(len(rawKey)))
13 - buf[0] = '/'
14 - base32.RawStdEncoding.Encode(buf[1:], rawKey)
15 - return ds.RawKey(string(buf))
16 -}
17 -
18 -func BinaryFromDsKey(k ds.Key) ([]byte, error) {
19 - return base32.RawStdEncoding.DecodeString(k.String()[1:])
20 -}
21 -
22 -func CidToDsKey(k *cid.Cid) ds.Key {
23 - return NewKeyFromBinary(k.Bytes())
24 -}
25 -
26 -func DsKeyToCid(dsKey ds.Key) (*cid.Cid, error) {
27 - kb, err := BinaryFromDsKey(dsKey)
28 - if err != nil {
29 - return nil, err
30 - }
31 - return cid.Cast(kb)
32 -}