From 9c7c2a3f2f2928771c27d51fb46fd7144bcfee65 Mon Sep 17 00:00:00 2001
From: Christian Decker <decker.christian@gmail.com>
Date: Wed, 15 Mar 2017 21:52:49 +0100
Subject: [PATCH] pytest: Added simple pytest for the new JSON-RPC

---
 contrib/pylightning/lightning/lightning.py | 10 ++++++++
 tests/test_lightningd.py                   | 28 ++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/contrib/pylightning/lightning/lightning.py b/contrib/pylightning/lightning/lightning.py
index 3682245fc..0550a281c 100644
--- a/contrib/pylightning/lightning/lightning.py
+++ b/contrib/pylightning/lightning/lightning.py
@@ -101,6 +101,16 @@ class LightningRpc(UnixDomainSocketRpc):
     def getnodes(self):
         return self._call("getnodes", [])
 
+    def newaddr(self):
+        return self._call("newaddr", [])['address']
+
+    def addfunds(self, tx):
+        return self._call("addfunds", [tx])
+
+    def fundchannel(self, node_id, capacity):
+        return self._call("fundchannel", [node_id, capacity])
+
+
 class LegacyLightningRpc(UnixDomainSocketRpc):
     def getchannels(self):
         """List all known channels.
diff --git a/tests/test_lightningd.py b/tests/test_lightningd.py
index 157762744..328c96a65 100644
--- a/tests/test_lightningd.py
+++ b/tests/test_lightningd.py
@@ -126,6 +126,34 @@ class LightningDTests(BaseLightningDTests):
         assert p1['condition'] == 'Exchanging gossip'
         assert p2['condition'] == 'Exchanging gossip'
 
+    def test_gossip_jsonrpc(self):
+        l1 = self.node_factory.get_node(legacy=False)
+        l2 = self.node_factory.get_node(legacy=False)
+        ret = l1.rpc.connect('localhost', l2.info['port'], l2.info['id'])
+
+        assert ret['id'] == l2.info['id']
+
+        addr = l1.rpc.newaddr()
+
+        txid = l1.bitcoin.rpc.sendtoaddress(addr, 0.02)
+        tx = l1.bitcoin.rpc.getrawtransaction(txid)
+
+        l1.rpc.addfunds(tx)
+        l1.rpc.fundchannel(l2.info['id'], 10**5)
+
+        l1.daemon.wait_for_log('WIRE_HSMCTL_SIGN_FUNDING_REPLY')
+
+        time.sleep(1)
+        l1.bitcoin.rpc.generate(6)
+
+        l1.daemon.wait_for_log('Normal operation')
+        l2.daemon.wait_for_log('Normal operation')
+
+        time.sleep(1)
+
+        nodes = l1.rpc.getnodes()['nodes']
+        assert set([n['nodeid'] for n in nodes]) == set([l1.info['id'], l2.info['id']])
+
 class LegacyLightningDTests(BaseLightningDTests):
 
     def test_connect(self):