opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-21 03:28:56 +08:00
Code Issues Projects Releases Wiki Activity

coreapi swarm: unify type with other apis

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2018-10-03 01:49:39 +02:00
parent 4f9bde807b
commit 7b478209b9
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/coreapi/coreapi.go
View File

@ -70,5 +70,5 @@ func (api *CoreAPI) Dht() coreiface.DhtAPI {
// Swarm returns the SwarmAPI interface implementation backed by the go-ipfs node // Swarm returns the SwarmAPI interface implementation backed by the go-ipfs node
func (api *CoreAPI) Swarm() coreiface.SwarmAPI { func (api *CoreAPI) Swarm() coreiface.SwarmAPI {
return &SwarmAPI{api} return (*SwarmAPI)(api)
} }

11
core/coreapi/swarm.go
View File

@ -5,6 +5,7 @@ import (
"sort" "sort"
"time" "time"
core "github.com/ipfs/go-ipfs/core"
coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface" coreiface "github.com/ipfs/go-ipfs/core/coreapi/interface"
swarm "gx/ipfs/QmPQoCVRHaGD25VffyB7DFV5qP65hFSQJdSDy75P1vYBKe/go-libp2p-swarm" swarm "gx/ipfs/QmPQoCVRHaGD25VffyB7DFV5qP65hFSQJdSDy75P1vYBKe/go-libp2p-swarm"
@ -17,12 +18,10 @@ import (
net "gx/ipfs/QmfDPh144WGBqRxZb1TGDHerbMnZATrHZggAPw7putNnBq/go-libp2p-net" net "gx/ipfs/QmfDPh144WGBqRxZb1TGDHerbMnZATrHZggAPw7putNnBq/go-libp2p-net"
) )
type SwarmAPI struct { type SwarmAPI CoreAPI
*CoreAPI
}
type connInfo struct { type connInfo struct {
api *CoreAPI node *core.IpfsNode
conn net.Conn conn net.Conn
dir net.Direction dir net.Direction
@ -126,7 +125,7 @@ func (api *SwarmAPI) Peers(context.Context) ([]coreiface.ConnectionInfo, error)
addr := c.RemoteMultiaddr() addr := c.RemoteMultiaddr()
ci := &connInfo{ ci := &connInfo{
api: api.CoreAPI, node: api.node,
conn: c, conn: c,
dir: c.Stat().Direction, dir: c.Stat().Direction,
@ -161,7 +160,7 @@ func (ci *connInfo) Direction() net.Direction {
} }
func (ci *connInfo) Latency() (time.Duration, error) { func (ci *connInfo) Latency() (time.Duration, error) {
return ci.api.node.Peerstore.LatencyEWMA(peer.ID(ci.ID())), nil return ci.node.Peerstore.LatencyEWMA(peer.ID(ci.ID())), nil
} }
func (ci *connInfo) Streams() ([]protocol.ID, error) { func (ci *connInfo) Streams() ([]protocol.ID, error) {