Update imports to use extracted interface
This commit was moved from ipfs/go-ipfs-http-client@fad467bc437a1282ed3813d828c6f8ec5b7b2d7a
Łukasz Magiera committed
Feb 11, 2019 at 18:40 UTC
ef5bf40df1d0d790aeb213147c53412145894bf0
15 files changed
+36
-47
client/httpapi/api.go
+2
-3
@@ -9,9 +9,8 @@ import (
9
"path"
10
"strings"
11
12
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
13
- caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
14
-
12
+ iface "github.com/ipfs/interface-go-ipfs-core"
13
+ caopts "github.com/ipfs/interface-go-ipfs-core/options"
14
homedir "github.com/mitchellh/go-homedir"
15
ma "github.com/multiformats/go-multiaddr"
16
manet "github.com/multiformats/go-multiaddr-net"
client/httpapi/api_test.go
+3
-4
@@ -10,10 +10,9 @@ import (
10
"strconv"
11
"testing"
12
13
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
14
- caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
15
- "github.com/ipfs/go-ipfs/core/coreapi/interface/tests"
16
-
13
+ "github.com/ipfs/interface-go-ipfs-core"
14
+ caopts "github.com/ipfs/interface-go-ipfs-core/options"
15
+ "github.com/ipfs/interface-go-ipfs-core/tests"
16
local "github.com/ipfs/iptb-plugins/local"
17
"github.com/ipfs/iptb/cli"
18
"github.com/ipfs/iptb/testbed"
client/httpapi/apifile.go
+4
-5
@@ -4,13 +4,12 @@ import (
4
"context"
5
"encoding/json"
6
"fmt"
7
- "github.com/ipfs/go-cid"
7
"io"
8
"io/ioutil"
9
11
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
12
-
10
+ "github.com/ipfs/go-cid"
11
"github.com/ipfs/go-ipfs-files"
12
+ "github.com/ipfs/interface-go-ipfs-core"
13
)
14
15
const forwardSeekLimit = 1 << 14 //16k
@@ -92,8 +91,8 @@ func (f *apiFile) Seek(offset int64, whence int) (int64, error) {
91
return offset, nil
92
}
93
95
- if f.at < offset && offset - f.at < forwardSeekLimit { //forward skip
96
- r, err := io.CopyN(ioutil.Discard, f.r, offset - f.at)
94
+ if f.at < offset && offset-f.at < forwardSeekLimit { //forward skip
95
+ r, err := io.CopyN(ioutil.Discard, f.r, offset-f.at)
96
97
f.at += r
98
return f.at, err
client/httpapi/block.go
+2
-2
@@ -8,8 +8,8 @@ import (
8
"io"
9
10
"github.com/ipfs/go-cid"
11
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
12
- caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
11
+ "github.com/ipfs/interface-go-ipfs-core"
12
+ caopts "github.com/ipfs/interface-go-ipfs-core/options"
13
mh "github.com/multiformats/go-multihash"
14
)
15
client/httpapi/dag.go
+2
-3
@@ -7,12 +7,11 @@ import (
7
"io/ioutil"
8
"sync"
9
10
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
11
- "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
12
-
10
"github.com/ipfs/go-block-format"
11
"github.com/ipfs/go-cid"
12
"github.com/ipfs/go-ipld-format"
13
+ "github.com/ipfs/interface-go-ipfs-core"
14
+ "github.com/ipfs/interface-go-ipfs-core/options"
15
)
16
17
type httpNodeAdder HttpApi
client/httpapi/dht.go
+2
-2
@@ -3,9 +3,9 @@ package httpapi
3
import (
4
"context"
5
"encoding/json"
6
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
7
- caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
6
7
+ "github.com/ipfs/interface-go-ipfs-core"
8
+ caopts "github.com/ipfs/interface-go-ipfs-core/options"
9
"github.com/libp2p/go-libp2p-peer"
10
"github.com/libp2p/go-libp2p-peerstore"
11
notif "github.com/libp2p/go-libp2p-routing/notifications"
client/httpapi/ipldnode.go
+1
-2
@@ -6,11 +6,10 @@ import (
6
"io/ioutil"
7
"strconv"
8
9
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
10
-
9
"github.com/ipfs/go-cid"
10
ipld "github.com/ipfs/go-ipld-format"
11
ipfspath "github.com/ipfs/go-path"
12
+ "github.com/ipfs/interface-go-ipfs-core"
13
)
14
15
type ipldNode struct {
client/httpapi/key.go
+2
-3
@@ -4,9 +4,8 @@ import (
4
"context"
5
"errors"
6
7
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
8
- caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
9
-
7
+ "github.com/ipfs/interface-go-ipfs-core"
8
+ caopts "github.com/ipfs/interface-go-ipfs-core/options"
9
"github.com/libp2p/go-libp2p-peer"
10
)
11
client/httpapi/name.go
+3
-3
@@ -3,10 +3,10 @@ package httpapi
3
import (
4
"context"
5
"fmt"
6
- "github.com/ipfs/go-ipfs/namesys/opts"
6
8
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
9
- caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
7
+ "github.com/ipfs/interface-go-ipfs-core"
8
+ caopts "github.com/ipfs/interface-go-ipfs-core/options"
9
+ "github.com/ipfs/interface-go-ipfs-core/options/namesys"
10
)
11
12
type NameAPI HttpApi
client/httpapi/object.go
+2
-3
@@ -6,12 +6,11 @@ import (
6
"io"
7
"io/ioutil"
8
9
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
10
- caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
11
-
9
"github.com/ipfs/go-cid"
10
"github.com/ipfs/go-ipld-format"
11
"github.com/ipfs/go-merkledag"
12
+ "github.com/ipfs/interface-go-ipfs-core"
13
+ caopts "github.com/ipfs/interface-go-ipfs-core/options"
14
)
15
16
type ObjectAPI HttpApi
client/httpapi/path.go
+1
-2
@@ -3,11 +3,10 @@ package httpapi
3
import (
4
"context"
5
6
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
7
-
6
cid "github.com/ipfs/go-cid"
7
ipld "github.com/ipfs/go-ipld-format"
8
ipfspath "github.com/ipfs/go-path"
9
+ "github.com/ipfs/interface-go-ipfs-core"
10
)
11
12
func (api *HttpApi) ResolvePath(ctx context.Context, path iface.Path) (iface.ResolvedPath, error) {
client/httpapi/pin.go
+3
-3
@@ -3,11 +3,11 @@ package httpapi
3
import (
4
"context"
5
"encoding/json"
6
+
7
"github.com/ipfs/go-cid"
8
+ "github.com/ipfs/interface-go-ipfs-core"
9
+ caopts "github.com/ipfs/interface-go-ipfs-core/options"
10
"github.com/pkg/errors"
8
-
9
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
10
- caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
11
)
12
13
type PinAPI HttpApi
client/httpapi/pubsub.go
+2
-3
@@ -6,9 +6,8 @@ import (
6
"encoding/json"
7
"io"
8
9
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
10
- caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
11
-
9
+ "github.com/ipfs/interface-go-ipfs-core"
10
+ caopts "github.com/ipfs/interface-go-ipfs-core/options"
11
"github.com/libp2p/go-libp2p-peer"
12
)
13
client/httpapi/swarm.go
+2
-3
@@ -2,14 +2,13 @@ package httpapi
2
3
import (
4
"context"
5
- "github.com/libp2p/go-libp2p-protocol"
5
"time"
6
8
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
9
-
7
+ "github.com/ipfs/interface-go-ipfs-core"
8
inet "github.com/libp2p/go-libp2p-net"
9
"github.com/libp2p/go-libp2p-peer"
10
"github.com/libp2p/go-libp2p-peerstore"
11
+ "github.com/libp2p/go-libp2p-protocol"
12
"github.com/multiformats/go-multiaddr"
13
)
14
client/httpapi/unixfs.go
+5
-6
@@ -3,16 +3,15 @@ package httpapi
3
import (
4
"context"
5
"encoding/json"
6
+ "errors"
7
"fmt"
7
- "github.com/ipfs/go-cid"
8
- "github.com/pkg/errors"
8
"io"
9
11
- "github.com/ipfs/go-ipfs/core/coreapi/interface"
12
- caopts "github.com/ipfs/go-ipfs/core/coreapi/interface/options"
13
-
10
+ "github.com/ipfs/go-cid"
11
"github.com/ipfs/go-ipfs-files"
12
"github.com/ipfs/go-ipld-format"
13
+ "github.com/ipfs/interface-go-ipfs-core"
14
+ caopts "github.com/ipfs/interface-go-ipfs-core/options"
15
mh "github.com/multiformats/go-multihash"
16
)
17
@@ -208,7 +207,7 @@ func (api *UnixfsAPI) Ls(ctx context.Context, p iface.Path, opts ...caopts.Unixf
207
select {
208
case out <- iface.LsLink{
209
Link: &format.Link{
211
- Cid: c,
210
+ Cid: c,
211
Name: l0.Name,
212
Size: l0.Size,
213
},