From c4b64ebb6ddaa7e10b77c982f9c5b5c17ca4d8a3 Mon Sep 17 00:00:00 2001 From: Jonathan Zernik Date: Sat, 18 Jul 2020 03:16:51 -0700 Subject: [PATCH] Return lnd wallet balance response in admin rpc proto (#78) --- itests/test.py | 8 ++++---- proto/squeak_admin.proto | 6 +++--- squeakserver/admin/squeak_admin_server_handler.py | 3 +-- squeakserver/admin/squeak_admin_server_servicer.py | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/itests/test.py b/itests/test.py index 071433db..92ed9bac 100644 --- a/itests/test.py +++ b/itests/test.py @@ -242,8 +242,8 @@ def run(): # Check the server balance get_balance_response = admin_stub.GetBalance(squeak_admin_pb2.GetBalanceRequest()) - print("Get balance response balance: " + str(get_balance_response.balance)) - assert get_balance_response.balance == 0 + print("Get balance response: " + str(get_balance_response)) + assert get_balance_response.wallet_balance_response.total_balance == 0 # Create a new signing profile profile_name = 'bob' @@ -287,8 +287,8 @@ def run(): # Check the server balance get_balance_response = admin_stub.GetBalance(squeak_admin_pb2.GetBalanceRequest()) - print("Get balance response balance: " + str(get_balance_response.balance)) - assert get_balance_response.balance == 1000 + print("Get balance response: " + str(get_balance_response)) + assert get_balance_response.wallet_balance_response.total_balance == 1000 if __name__ == '__main__': diff --git a/proto/squeak_admin.proto b/proto/squeak_admin.proto index 37bdb647..4d8c73a6 100644 --- a/proto/squeak_admin.proto +++ b/proto/squeak_admin.proto @@ -7,7 +7,7 @@ option objc_class_prefix = "SQK"; package squeakserver; -// import "lnd.proto"; +import "proto/lnd.proto"; // Interface exported by the server. service SqueakAdmin { @@ -34,8 +34,8 @@ message GetBalanceRequest { } message GetBalanceReply { - /// The wallet balance - int64 balance = 1; + /// The wallet balance response + lnrpc.WalletBalanceResponse wallet_balance_response = 1; } message CreateSigningProfileRequest { diff --git a/squeakserver/admin/squeak_admin_server_handler.py b/squeakserver/admin/squeak_admin_server_handler.py index ac9428aa..de51cab2 100644 --- a/squeakserver/admin/squeak_admin_server_handler.py +++ b/squeakserver/admin/squeak_admin_server_handler.py @@ -37,8 +37,7 @@ class SqueakAdminServerHandler(object): def handle_get_balance(self): logger.info("Handle get balance") wallet_balance = self.lightning_client.get_wallet_balance() - logger.info("Wallet balance: {}".format(wallet_balance)) - return wallet_balance.total_balance + return wallet_balance def handle_create_signing_profile(self, profile_name): logger.info("Handle create signing profile with name: {}".format(profile_name)) diff --git a/squeakserver/admin/squeak_admin_server_servicer.py b/squeakserver/admin/squeak_admin_server_servicer.py index 35a8eb62..474eef13 100644 --- a/squeakserver/admin/squeak_admin_server_servicer.py +++ b/squeakserver/admin/squeak_admin_server_servicer.py @@ -23,9 +23,9 @@ class SqueakAdminServerServicer(squeak_admin_pb2_grpc.SqueakAdminServicer): self.handler = handler def GetBalance(self, request, context): - total_balance = self.handler.handle_get_balance() + wallet_balance_response = self.handler.handle_get_balance() return squeak_admin_pb2.GetBalanceReply( - balance=total_balance, + wallet_balance_response=wallet_balance_response, ) def CreateSigningProfile(self, request, context):