coreapi swarm: unify type with other apis
License: MIT Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
Łukasz Magiera committed
Oct 3, 2018 at 01:49 UTC
7b478209b940addcaa993c7577a79af50f8c046f
2 files changed
+6
-7
core/coreapi/coreapi.go
+1
-1
@@ -70,5 +70,5 @@ func (api *CoreAPI) Dht() coreiface.DhtAPI {
70
71
// Swarm returns the SwarmAPI interface implementation backed by the go-ipfs node
72
func (api *CoreAPI) Swarm() coreiface.SwarmAPI {
73
- return &SwarmAPI{api}
73
+ return (*SwarmAPI)(api)
74
}
core/coreapi/swarm.go
+5
-6
@@ -5,6 +5,7 @@ import (
5
"sort"
6
"time"
7
8
+ core "github.com/ipfs/go-ipfs/core"
9
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
10
11
swarm "gx/ipfs/QmPQoCVRHaGD25VffyB7DFV5qP65hFSQJdSDy75P1vYBKe/go-libp2p-swarm"
@@ -17,12 +18,10 @@ import (
18
net "gx/ipfs/QmfDPh144WGBqRxZb1TGDHerbMnZATrHZggAPw7putNnBq/go-libp2p-net"
19
)
20
20
-type SwarmAPI struct {
21
- *CoreAPI
22
-}
21
+type SwarmAPI CoreAPI
22
23
type connInfo struct {
25
- api *CoreAPI
24
+ node *core.IpfsNode
25
conn net.Conn
26
dir net.Direction
27
@@ -126,7 +125,7 @@ func (api *SwarmAPI) Peers(context.Context) ([]coreiface.ConnectionInfo, error)
125
addr := c.RemoteMultiaddr()
126
127
ci := &connInfo{
129
- api: api.CoreAPI,
128
+ node: api.node,
129
conn: c,
130
dir: c.Stat().Direction,
131
@@ -161,7 +160,7 @@ func (ci *connInfo) Direction() net.Direction {
160
}
161
162
func (ci *connInfo) Latency() (time.Duration, error) {
164
- return ci.api.node.Peerstore.LatencyEWMA(peer.ID(ci.ID())), nil
163
+ return ci.node.Peerstore.LatencyEWMA(peer.ID(ci.ID())), nil
164
}
165
166
func (ci *connInfo) Streams() ([]protocol.ID, error) {