Remove thirdparty/datastore2/delayed.go: part of new go-datastore
License: MIT Signed-off-by: Hector Sanjuan <hector@protocol.ai>
Hector Sanjuan committed
Feb 27, 2018 at 21:49 UTC
a6848aa2b4cc1e5060394a9afda627e032f8b9d6
2 files changed
+2
-49
exchange/bitswap/testutils.go
+2
-2
@@ -5,11 +5,11 @@ import (
5
"time"
6
7
tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
8
- datastore2 "github.com/ipfs/go-ipfs/thirdparty/datastore2"
8
9
delay "gx/ipfs/QmRJVNatYJwTAHgdSM1Xef9QVQ1Ch3XHdmcrykjP5Y4soL/go-ipfs-delay"
10
testutil "gx/ipfs/QmVvkK7s5imCiq3JVbL3pGfnhcCnf3LrFJPF4GE2sAoGZf/go-testutil"
11
ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
12
+ delayed "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/delayed"
13
ds_sync "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/sync"
14
p2ptestutil "gx/ipfs/QmYVR3C8DWPHdHxvLtNFYfjsXgaRAdh6hPMNH3KiwCgu4o/go-libp2p-netutil"
15
peer "gx/ipfs/QmZoWKhxUmZ2seW4BzX6fJkNR8hh9PsGModr7q171yq2SS/go-libp2p-peer"
@@ -90,7 +90,7 @@ func MkSession(ctx context.Context, net tn.Network, p testutil.Identity) Instanc
90
bsdelay := delay.Fixed(0)
91
92
adapter := net.Adapter(p)
93
- dstore := ds_sync.MutexWrap(datastore2.WithDelay(ds.NewMapDatastore(), bsdelay))
93
+ dstore := ds_sync.MutexWrap(delayed.New(ds.NewMapDatastore(), bsdelay))
94
95
bstore, err := blockstore.CachedBlockstore(ctx,
96
blockstore.NewBlockstore(ds_sync.MutexWrap(dstore)),
thirdparty/datastore2/delayed.go
deleted
-47
@@ -1,47 +0,0 @@
1
-package datastore2
2
-
3
-import (
4
- delay "gx/ipfs/QmRJVNatYJwTAHgdSM1Xef9QVQ1Ch3XHdmcrykjP5Y4soL/go-ipfs-delay"
5
- ds "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore"
6
- dsq "gx/ipfs/QmXRKBQA4wXP7xWbFiZsR1GP4HV6wMDQ1aWFxZZ4uBcPX9/go-datastore/query"
7
-)
8
-
9
-func WithDelay(ds ds.Datastore, delay delay.D) ds.Datastore {
10
- return &delayed{ds: ds, delay: delay}
11
-}
12
-
13
-type delayed struct {
14
- ds ds.Datastore
15
- delay delay.D
16
-}
17
-
18
-func (dds *delayed) Put(key ds.Key, value interface{}) (err error) {
19
- dds.delay.Wait()
20
- return dds.ds.Put(key, value)
21
-}
22
-
23
-func (dds *delayed) Get(key ds.Key) (value interface{}, err error) {
24
- dds.delay.Wait()
25
- return dds.ds.Get(key)
26
-}
27
-
28
-func (dds *delayed) Has(key ds.Key) (exists bool, err error) {
29
- dds.delay.Wait()
30
- return dds.ds.Has(key)
31
-}
32
-
33
-func (dds *delayed) Delete(key ds.Key) (err error) {
34
- dds.delay.Wait()
35
- return dds.ds.Delete(key)
36
-}
37
-
38
-func (dds *delayed) Query(q dsq.Query) (dsq.Results, error) {
39
- dds.delay.Wait()
40
- return dds.ds.Query(q)
41
-}
42
-
43
-func (dds *delayed) Batch() (ds.Batch, error) {
44
- return ds.NewBasicBatch(dds), nil
45
-}
46
-
47
-var _ ds.Datastore = &delayed{}