From c7148cd83c30588130647264bf60154be013e38b Mon Sep 17 00:00:00 2001
From: Juan Batiz-Benet <juan@benet.ai>
Date: Mon, 15 Sep 2014 17:36:03 -0700
Subject: [PATCH] Service: remove RequestID from SendMessage

---
 bitswap/transmission/service_wrapper.go |  3 +--
 net/service/service.go                  | 13 +++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bitswap/transmission/service_wrapper.go b/bitswap/transmission/service_wrapper.go
index fc02e48a6..60f52baef 100644
--- a/bitswap/transmission/service_wrapper.go
+++ b/bitswap/transmission/service_wrapper.go
@@ -58,8 +58,7 @@ func (wrapper *senderWrapper) SendMessage(
 	if err != nil {
 		return err
 	}
-	req, err := netservice.NewRequest(p.ID)
-	return wrapper.serviceDelegate.SendMessage(ctx, nmsg, req.ID)
+	return wrapper.serviceDelegate.SendMessage(ctx, nmsg)
 }
 
 func (wrapper *senderWrapper) SendRequest(ctx context.Context,
diff --git a/net/service/service.go b/net/service/service.go
index a40d5ed3c..eac6236db 100644
--- a/net/service/service.go
+++ b/net/service/service.go
@@ -69,8 +69,8 @@ func (s *Service) GetPipe() *msg.Pipe {
 	return s.Pipe
 }
 
-// SendMessage sends a message out
-func (s *Service) SendMessage(ctx context.Context, m msg.NetMessage, rid RequestID) error {
+// sendMessage sends a message out (actual leg work. SendMessage is to export w/o rid)
+func (s *Service) sendMessage(ctx context.Context, m msg.NetMessage, rid RequestID) error {
 
 	// serialize ServiceMessage wrapper
 	data, err := wrapData(m.Data(), rid)
@@ -89,6 +89,11 @@ func (s *Service) SendMessage(ctx context.Context, m msg.NetMessage, rid Request
 	return nil
 }
 
+// SendMessage sends a message out
+func (s *Service) SendMessage(ctx context.Context, m msg.NetMessage) error {
+	return s.sendMessage(ctx, m, nil)
+}
+
 // SendRequest sends a request message out and awaits a response.
 func (s *Service) SendRequest(ctx context.Context, m msg.NetMessage) (msg.NetMessage, error) {
 
@@ -118,7 +123,7 @@ func (s *Service) SendRequest(ctx context.Context, m msg.NetMessage) (msg.NetMes
 	}
 
 	// Send message
-	s.SendMessage(ctx, m, r.ID)
+	s.sendMessage(ctx, m, r.ID)
 
 	// wait for response
 	m = nil
@@ -170,7 +175,7 @@ func (s *Service) handleIncomingMessage(ctx context.Context, m msg.NetMessage) {
 
 		// if handler gave us a response, send it back out!
 		if r1 != nil {
-			err := s.SendMessage(ctx, r1, rid.Response())
+			err := s.sendMessage(ctx, r1, rid.Response())
 			if err != nil {
 				u.PErr("error sending response message: %v\n", err)
 			}