From d73b40c4c3a2c1183f68ff60cdf0675bb0e5d29d Mon Sep 17 00:00:00 2001
From: Jonathan Zernik <yzernik@gmail.com>
Date: Wed, 4 Nov 2020 07:19:39 -0500
Subject: [PATCH] Rename getoffer rpc method (#373)

---
 itests/tests/test_squeak_node.py            | 16 ++++++++--------
 proto/squeak_server.proto                   |  8 ++++----
 squeaknode/network/peer_client.py           |  4 ++--
 squeaknode/server/squeak_server_servicer.py |  6 +++---
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/itests/tests/test_squeak_node.py b/itests/tests/test_squeak_node.py
index 00ab4a9a..3a9f155c 100644
--- a/itests/tests/test_squeak_node.py
+++ b/itests/tests/test_squeak_node.py
@@ -146,8 +146,8 @@ def test_sell_squeak(server_stub, admin_stub, lightning_client, saved_squeak_has
     challenge = get_challenge(encryption_key, expected_proof)
 
     # Buy the squeak data key
-    buy_response = server_stub.BuySqueak(
-        squeak_server_pb2.BuySqueakRequest(
+    buy_response = server_stub.GetOffer(
+        squeak_server_pb2.GetOfferRequest(
             hash=saved_squeak_hash,
             challenge=challenge,
         )
@@ -619,8 +619,8 @@ def test_list_channels(server_stub, admin_stub, lightning_client, saved_squeak_h
     challenge = get_challenge(encryption_key, expected_proof)
 
     # Buy the squeak data key
-    buy_response = server_stub.BuySqueak(
-        squeak_server_pb2.BuySqueakRequest(
+    buy_response = server_stub.GetOffer(
+        squeak_server_pb2.GetOfferRequest(
             hash=saved_squeak_hash,
             challenge=challenge,
         )
@@ -674,8 +674,8 @@ def test_list_peers(server_stub, admin_stub, lightning_client, saved_squeak_hash
     challenge = get_challenge(encryption_key, expected_proof)
 
     # Buy the squeak data key
-    buy_response = server_stub.BuySqueak(
-        squeak_server_pb2.BuySqueakRequest(
+    buy_response = server_stub.GetOffer(
+        squeak_server_pb2.GetOfferRequest(
             hash=saved_squeak_hash,
             challenge=challenge,
         )
@@ -728,8 +728,8 @@ def test_open_channel(server_stub, admin_stub, lightning_client, saved_squeak_ha
     challenge = get_challenge(encryption_key, expected_proof)
 
     # Buy the squeak data key
-    buy_response = server_stub.BuySqueak(
-        squeak_server_pb2.BuySqueakRequest(
+    buy_response = server_stub.GetOffer(
+        squeak_server_pb2.GetOfferRequest(
             hash=saved_squeak_hash,
             challenge=challenge,
         )
diff --git a/proto/squeak_server.proto b/proto/squeak_server.proto
index 3128a601..541865e5 100644
--- a/proto/squeak_server.proto
+++ b/proto/squeak_server.proto
@@ -22,9 +22,9 @@ service SqueakServer {
   */
   rpc LookupSqueaks (LookupSqueaksRequest) returns (LookupSqueaksReply) {}
 
-  /** sqk: `buysqueak`
+  /** sqk: `getoffer`
   */
-  rpc BuySqueak (BuySqueakRequest) returns (BuySqueakReply) {}
+  rpc GetOffer (GetOfferRequest) returns (GetOfferReply) {}
 
 }
 
@@ -47,7 +47,7 @@ message LookupSqueaksRequest {
     int32 max_block = 3;
 }
 
-message BuySqueakRequest {
+message GetOfferRequest {
     /// Hash of the squeak to buy.
     bytes hash = 1;
 
@@ -71,7 +71,7 @@ message LookupSqueaksReply {
     repeated string allowed_addresses = 2;
 }
 
-message BuySqueakReply {
+message GetOfferReply {
     /// The buy offer
     SqueakBuyOffer offer = 1;
 }
diff --git a/squeaknode/network/peer_client.py b/squeaknode/network/peer_client.py
index cd0ee66c..668550e8 100644
--- a/squeaknode/network/peer_client.py
+++ b/squeaknode/network/peer_client.py
@@ -53,8 +53,8 @@ class PeerClient:
 
     def buy_squeak(self, squeak_hash, challenge):
         with self.get_stub() as stub:
-            buy_response = stub.BuySqueak(
-                squeak_server_pb2.BuySqueakRequest(
+            buy_response = stub.GetOffer(
+                squeak_server_pb2.GetOfferRequest(
                     hash=squeak_hash,
                     challenge=challenge,
                 )
diff --git a/squeaknode/server/squeak_server_servicer.py b/squeaknode/server/squeak_server_servicer.py
index e5e0c78d..ee8c0b51 100644
--- a/squeaknode/server/squeak_server_servicer.py
+++ b/squeaknode/server/squeak_server_servicer.py
@@ -64,7 +64,7 @@ class SqueakServerServicer(squeak_server_pb2_grpc.SqueakServerServicer):
     def LookupSqueaks(self, request, context):
         return self.handler.handle_lookup_squeaks(request)
 
-    def BuySqueak(self, request, context):
+    def GetOffer(self, request, context):
         squeak_hash = request.hash
         # TODO: check if hash is valid
         challenge = request.challenge
@@ -74,13 +74,13 @@ class SqueakServerServicer(squeak_server_pb2_grpc.SqueakServerServicer):
         if buy_response == None:
             context.set_code(grpc.StatusCode.NOT_FOUND)
             context.set_details("Squeak not found.")
-            return squeak_server_pb2.BuySqueakReply(
+            return squeak_server_pb2.GetOfferReply(
                 offer=None,
             )
 
         offer_squeak_hash = buy_response.squeak_hash
 
-        return squeak_server_pb2.BuySqueakReply(
+        return squeak_server_pb2.GetOfferReply(
             offer=squeak_server_pb2.SqueakBuyOffer(
                 squeak_hash=offer_squeak_hash,
                 key_cipher=buy_response.key_cipher.cipher_bytes,