Service: remove RequestID from SendMessage
Juan Batiz-Benet committed
Sep 15, 2014 at 17:36 UTC
c7148cd83c30588130647264bf60154be013e38b
2 files changed
+10
-6
bitswap/transmission/service_wrapper.go
+1
-2
@@ -58,8 +58,7 @@ func (wrapper *senderWrapper) SendMessage(
58
if err != nil {
59
return err
60
}
61
- req, err := netservice.NewRequest(p.ID)
62
- return wrapper.serviceDelegate.SendMessage(ctx, nmsg, req.ID)
61
+ return wrapper.serviceDelegate.SendMessage(ctx, nmsg)
62
}
63
64
func (wrapper *senderWrapper) SendRequest(ctx context.Context,
net/service/service.go
+9
-4
@@ -69,8 +69,8 @@ func (s *Service) GetPipe() *msg.Pipe {
69
return s.Pipe
70
}
71
72
-// SendMessage sends a message out
73
-func (s *Service) SendMessage(ctx context.Context, m msg.NetMessage, rid RequestID) error {
72
+// sendMessage sends a message out (actual leg work. SendMessage is to export w/o rid)
73
+func (s *Service) sendMessage(ctx context.Context, m msg.NetMessage, rid RequestID) error {
74
75
// serialize ServiceMessage wrapper
76
data, err := wrapData(m.Data(), rid)
@@ -89,6 +89,11 @@ func (s *Service) SendMessage(ctx context.Context, m msg.NetMessage, rid Request
89
return nil
90
}
91
92
+// SendMessage sends a message out
93
+func (s *Service) SendMessage(ctx context.Context, m msg.NetMessage) error {
94
+ return s.sendMessage(ctx, m, nil)
95
+}
96
+
97
// SendRequest sends a request message out and awaits a response.
98
func (s *Service) SendRequest(ctx context.Context, m msg.NetMessage) (msg.NetMessage, error) {
99
@@ -118,7 +123,7 @@ func (s *Service) SendRequest(ctx context.Context, m msg.NetMessage) (msg.NetMes
123
}
124
125
// Send message
121
- s.SendMessage(ctx, m, r.ID)
126
+ s.sendMessage(ctx, m, r.ID)
127
128
// wait for response
129
m = nil
@@ -170,7 +175,7 @@ func (s *Service) handleIncomingMessage(ctx context.Context, m msg.NetMessage) {
175
176
// if handler gave us a response, send it back out!
177
if r1 != nil {
173
- err := s.SendMessage(ctx, r1, rid.Response())
178
+ err := s.sendMessage(ctx, r1, rid.Response())
179
if err != nil {
180
u.PErr("error sending response message: %v\n", err)
181
}