From 12263cb556b5e10388a3deaf1d796edf13cb557a Mon Sep 17 00:00:00 2001
From: Jonathan Zernik <yzernik@gmail.com>
Date: Tue, 9 Jun 2020 23:58:44 -0700
Subject: [PATCH] Remove comments from itest script and remove old itest
 config.ini file (#40)

---
 docker/sqkserver/config.ini.sh | 34 ----------------------------------
 itests/test.py                 |  7 +------
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 docker/sqkserver/config.ini.sh

diff --git a/docker/sqkserver/config.ini.sh b/docker/sqkserver/config.ini.sh
deleted file mode 100644
index e573bc38..00000000
--- a/docker/sqkserver/config.ini.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#define parameters which are passed in.
-NETWORK=$1
-LND_RPC_HOST=$2
-LND_RPC_PORT=$3
-SQK_RPC_HOST=$4
-SQK_RPC_PORT=$5
-
-#define the template.
-cat  << EOF
-
-[DEFAULT]
-network=$NETWORK
-
-[lnd]
-rpc_host=$LND_RPC_HOST
-rpc_port=$LND_RPC_PORT
-
-[electrum]
-rpc_host=
-rpc_port=
-rpc_user=
-rpc_pass=
-
-[server]
-rpc_host=$SQK_RPC_HOST
-rpc_port=$SQK_RPC_PORT
-
-[postgresql]
-host=db
-database=squeakserver
-user=postgres
-password=postgres
-
-EOF
diff --git a/itests/test.py b/itests/test.py
index e977dc8a..cb61e21c 100644
--- a/itests/test.py
+++ b/itests/test.py
@@ -178,10 +178,7 @@ def run():
         assert buy_response.offer.payment_request.startswith('ln')
 
         # Connect to the server lightning node
-        # lightning_host_port = buy_response.offer.host + ':' + buy_response.offer.port
-        lightning_host_port = buy_response.offer.host
-        # connect_peer_response = lnd_lightning_client.connect_peer(buy_response.offer.pubkey, 'lnd_sqkserver')
-        connect_peer_response = lnd_lightning_client.connect_peer(buy_response.offer.pubkey, lightning_host_port)
+        connect_peer_response = lnd_lightning_client.connect_peer(buy_response.offer.pubkey, buy_response.offer.host)
         print("Server connect peer response: " + str(connect_peer_response))
 
         # List peers
@@ -189,7 +186,6 @@ def run():
         print("Server list peers response: " + str(list_peers_response))
 
         # Open channel to the server lightning node
-        # pubkey_bytes = bytes.fromhex(buy_response.offer.pubkey)
         open_channel_response = lnd_lightning_client.open_channel_sync(buy_response.offer.pubkey, 1000000)
         print("Server open channel response: " + str(open_channel_response))
 
@@ -205,7 +201,6 @@ def run():
         print("Server list channels response: " + str(list_channels_response))
 
         # Pay the invoice
-        preimage = None
         payment = lnd_lightning_client.pay_invoice_sync(buy_response.offer.payment_request)
         print("Server pay invoice response: " + str(payment))
         preimage = payment.payment_preimage