fix(bs:msg) remove swarm.Message
no longer exists. instead, use net message
Brian Tiger Chow committed
Sep 14, 2014 at 05:27 UTC
0d3b0f10623ed86d2ef2601ae40b637717ec95ad
1 file changed
-16
bitswap/message/message.go
-16
@@ -3,12 +3,10 @@ package message
3
import (
4
"errors"
5
6
- proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
6
netmsg "github.com/jbenet/go-ipfs/net/message"
7
8
blocks "github.com/jbenet/go-ipfs/blocks"
9
nm "github.com/jbenet/go-ipfs/net/message"
11
- swarm "github.com/jbenet/go-ipfs/net/swarm"
10
peer "github.com/jbenet/go-ipfs/peer"
11
u "github.com/jbenet/go-ipfs/util"
12
)
@@ -23,7 +21,6 @@ type BitSwapMessage interface {
21
22
type Exportable interface {
23
ToProto() *PBMessage
26
- ToSwarm(p *peer.Peer) *swarm.Message
24
ToNet(p *peer.Peer) (nm.NetMessage, error)
25
}
26
@@ -74,24 +71,11 @@ func FromNet(nmsg netmsg.NetMessage) (BitSwapMessage, error) {
71
return nil, errors.New("TODO implement")
72
}
73
77
-func FromSwarm(sms swarm.Message) (BitSwapMessage, error) {
78
- var protoMsg PBMessage
79
- err := proto.Unmarshal(sms.Data, &protoMsg)
80
- if err != nil {
81
- return nil, err
82
- }
83
- return newMessageFromProto(protoMsg), nil
84
-}
85
-
74
func (m *message) ToProto() *PBMessage {
75
cp := m.pb
76
return &cp
77
}
78
91
-func (m *message) ToSwarm(p *peer.Peer) *swarm.Message {
92
- return swarm.NewMessage(p, m.ToProto())
93
-}
94
-
79
func (m *message) ToNet(p *peer.Peer) (nm.NetMessage, error) {
80
return nm.FromObject(p, m.ToProto())
81
}