mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-23 15:00:34 +01:00
Code Issues Projects Releases Wiki Activity

pytest: allow NodeFactory to create non-started peers.

Browse source 
Useful it we want to intercept bitcoin-cli first.

We move the getinfo() caching into start(), as that's when we can actually
use RPC.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2018-08-22 09:51:57 +09:30 • committed by Christian Decker
parent 7eed9cba90
commit cda6c97a57
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/utils.py
View file

@ -438,8 +438,10 @@ class LightningNode(object):
def start(self): def start(self):
self.daemon.start() self.daemon.start()
# Cache `getinfo`, we'll be using it a lot
self.info = self.rpc.getinfo()
# This shortcut is sufficient for our simple tests. # This shortcut is sufficient for our simple tests.
self.port = self.rpc.getinfo()['binding'][0]['port'] self.port = self.info['binding'][0]['port']
def stop(self, timeout=10): def stop(self, timeout=10):
""" Attempt to do a clean shutdown, but kill if it hangs """ Attempt to do a clean shutdown, but kill if it hangs
@ -682,7 +684,7 @@ class NodeFactory(object):
return [j.result() for j in jobs] return [j.result() for j in jobs]
def get_node(self, disconnect=None, options=None, may_fail=False, may_reconnect=False, random_hsm=False, feerates=(15000, 7500, 3750)): def get_node(self, disconnect=None, options=None, may_fail=False, may_reconnect=False, random_hsm=False, feerates=(15000, 7500, 3750), start=True):
with self.lock: with self.lock:
node_id = self.next_id node_id = self.next_id
self.next_id += 1 self.next_id += 1
@ -746,14 +748,12 @@ class NodeFactory(object):
'--log-file={}/valgrind-errors.%p'.format(node.daemon.lightning_dir) '--log-file={}/valgrind-errors.%p'.format(node.daemon.lightning_dir)
] ]
if start:
try: try:
node.start() node.start()
except Exception: except Exception:
node.daemon.stop() node.daemon.stop()
raise raise
# Cache `getinfo`, we'll be using it a lot
node.info = node.rpc.getinfo()
return node return node
def line_graph(self, num_nodes, fundchannel=True, fundamount=10**6, announce=False, opts=None): def line_graph(self, num_nodes, fundchannel=True, fundamount=10**6, announce=False, opts=None):