diff --git a/itests/tests/test_squeak_node.py b/itests/tests/test_squeak_node.py index c8f47558..f6c23fb6 100644 --- a/itests/tests/test_squeak_node.py +++ b/itests/tests/test_squeak_node.py @@ -603,16 +603,6 @@ def test_delete_peer(server_stub, admin_stub, peer_id): assert "Peer not found." in str(excinfo.value) -def test_new_address(server_stub, admin_stub, lightning_client): - # Get a new address - new_address_response = admin_stub.LndNewAddress(ln.NewAddressRequest()) - - print("address:") - print(new_address_response.address) - - assert len(new_address_response.address) > 0 - - def test_list_channels(server_stub, admin_stub, lightning_client, saved_squeak_hash): # Get the squeak from the server get_response = server_stub.GetSqueak( @@ -656,7 +646,13 @@ def test_list_channels(server_stub, admin_stub, lightning_client, saved_squeak_h assert len(list_channels_response.channels) == 0 -def test_get_transactions(server_stub, admin_stub, lightning_client): +def test_send_coins(server_stub, admin_stub, lightning_client): + new_address_response = admin_stub.LndNewAddress(ln.NewAddressRequest()) + send_coins_response = lightning_client.send_coins(new_address_response.address, 55555555) + time.sleep(40) get_transactions_response = admin_stub.LndGetTransactions(ln.GetTransactionsRequest()) - assert len(get_transactions_response.transactions) == 0 + assert any([ + transaction.tx_hash == send_coins_response.txid + for transaction in get_transactions_response.transactions + ]) diff --git a/squeakserver/admin/squeak_admin_server_handler.py b/squeakserver/admin/squeak_admin_server_handler.py index 979426da..aa60e0a2 100644 --- a/squeakserver/admin/squeak_admin_server_handler.py +++ b/squeakserver/admin/squeak_admin_server_handler.py @@ -35,7 +35,7 @@ class SqueakAdminServerHandler(object): def handle_lnd_get_transactions(self): logger.info("Handle lnd get transactions") - return self.lightning_client.list_channels() + return self.lightning_client.get_transactions() def handle_create_signing_profile(self, profile_name): logger.info("Handle create signing profile with name: {}".format(profile_name)) diff --git a/squeakserver/common/lnd_lightning_client.py b/squeakserver/common/lnd_lightning_client.py index 195e0209..cee5c141 100644 --- a/squeakserver/common/lnd_lightning_client.py +++ b/squeakserver/common/lnd_lightning_client.py @@ -193,3 +193,13 @@ class LNDLightningClient: get_transactions_request, metadata=[("macaroon", self.macaroon)], ) + + def send_coins(self, addr, amount): + send_coins_request = lnd_pb2.SendCoinsRequest( + addr=addr, + amount=amount, + ) + return self.stub.SendCoins( + send_coins_request, + metadata=[("macaroon", self.macaroon)], + )