Fix wrong message after syncing, fix test suite

Author: giacomocaironi

btclib_node/main.py

@@ -22,7 +22,8 @@ def finish_sync(node):
     if node.status == NodeStatus.BlockSynced:
         return
     node.status = NodeStatus.BlockSynced
-    # node.p2p_manager.sendall(Filterclear())
+    # start new connections with tx relay enabled
+    node.p2p_manager.stop_all()
 
 
 # TODO: support for failed updates

btclib_node/rpc/callbacks.py

@@ -142,7 +142,6 @@ def ping(node, conn, _):
 
 
 def stop(node, conn, _):
-    node.stop()
     return "Btclib node stopping"
 
 

btclib_node/rpc/connection.py

@@ -69,6 +69,14 @@ async def async_send(self, response):
     def send(self, response):
         asyncio.run_coroutine_threadsafe(self.async_send(response), self.loop)
 
+    # Use with care
+    def send_and_wait(self, response):
+        future = asyncio.run_coroutine_threadsafe(self.async_send(response), self.loop)
+        try:
+            future.result(timeout=2)
+        except TimeoutError:
+            pass
+
     def __repr__(self):
         try:
             out = f"Connection to {self.client.getpeername()[0]}:{self.client.getpeername()[1]}"

btclib_node/rpc/main.py

@@ -66,6 +66,10 @@ def handle_rpc(node):
                 node.logger.exception("Exception occurred")
                 response.append(error_msg(-32603))
 
-    conn.send(response)
+    if request.get("method") == "stop":
+        conn.send_and_wait(response)
+        node.stop()
+    else:
+        conn.send(response)
     node.logger.debug("Finished rpc\n")
     # node.rpc_manager.connections.pop(conn_id)

tests/functional/p2p/test_tx.py

@@ -38,24 +38,26 @@ def test_send_tx(tmp_path):
 
     wait_until(lambda: node1.p2p_manager.is_alive())
     wait_until(lambda: node2.p2p_manager.is_alive())
+
+    # Add one block
+    block = generate_random_chain(1, RegTest().genesis.hash)[0]
+    for node in (node1, node2):
+        block_index = node.chainstate.block_index
+        node.chainstate.block_index.add_headers([block.header])
+        node.status = NodeStatus.HeaderSynced
+        node.block_db.add_block(block)
+        block_info = block_index.get_block_info(block.header.hash)
+        block_info.downloaded = True
+        block_index.insert_block_info(block_info)
+        wait_until(lambda: len(block_index.active_chain) == 2)
+
     node2.p2p_manager.connect(local_addr(node1.p2p_port))
     wait_until(lambda: len(node1.p2p_manager.connections))
     connection = node1.p2p_manager.connections[0]
     wait_until(lambda: connection.status == P2pConnStatus.Connected)
     connection = node2.p2p_manager.connections[0]
     wait_until(lambda: connection.status == P2pConnStatus.Connected)
 
-    # Add one block
-    block = generate_random_chain(1, RegTest().genesis.hash)[0]
-    block_index = node1.chainstate.block_index
-    node1.chainstate.block_index.add_headers([block.header])
-    node1.status = NodeStatus.HeaderSynced
-    node1.block_db.add_block(block)
-    block_info = block_index.get_block_info(block.header.hash)
-    block_info.downloaded = True
-    block_index.insert_block_info(block_info)
-    wait_until(lambda: len(block_index.active_chain) == 2)
-
     tx = generate_random_transaction(block.transactions[0].id)
 
     assert node1.mempool.size == 0