From 0d3b0f10623ed86d2ef2601ae40b637717ec95ad Mon Sep 17 00:00:00 2001
From: Brian Tiger Chow <brian.holderchow@gmail.com>
Date: Sun, 14 Sep 2014 05:27:32 -0700
Subject: [PATCH] fix(bs:msg) remove swarm.Message
no longer exists. instead, use net message
---
bitswap/message/message.go | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/bitswap/message/message.go b/bitswap/message/message.go
index f2e12edf..01ef4025 100644
--- a/bitswap/message/message.go
+++ b/bitswap/message/message.go
@@ -3,12 +3,10 @@ package message
import (
"errors"
- proto "github.com/jbenet/go-ipfs/Godeps/_workspace/src/code.google.com/p/goprotobuf/proto"
netmsg "github.com/jbenet/go-ipfs/net/message"
blocks "github.com/jbenet/go-ipfs/blocks"
nm "github.com/jbenet/go-ipfs/net/message"
- swarm "github.com/jbenet/go-ipfs/net/swarm"
peer "github.com/jbenet/go-ipfs/peer"
u "github.com/jbenet/go-ipfs/util"
)
@@ -23,7 +21,6 @@ type BitSwapMessage interface {
type Exportable interface {
ToProto() *PBMessage
- ToSwarm(p *peer.Peer) *swarm.Message
ToNet(p *peer.Peer) (nm.NetMessage, error)
}
@@ -74,24 +71,11 @@ func FromNet(nmsg netmsg.NetMessage) (BitSwapMessage, error) {
return nil, errors.New("TODO implement")
}
-func FromSwarm(sms swarm.Message) (BitSwapMessage, error) {
- var protoMsg PBMessage
- err := proto.Unmarshal(sms.Data, &protoMsg)
- if err != nil {
- return nil, err
- }
- return newMessageFromProto(protoMsg), nil
-}
-
func (m *message) ToProto() *PBMessage {
cp := m.pb
return &cp
}
-func (m *message) ToSwarm(p *peer.Peer) *swarm.Message {
- return swarm.NewMessage(p, m.ToProto())
-}
-
func (m *message) ToNet(p *peer.Peer) (nm.NetMessage, error) {
return nm.FromObject(p, m.ToProto())
}
--
GitLab