create_bundle_from_mempool() doesn't need to be async (Chia-Network#1…

…4114) create_bundle_from_mempool() doesn't need to be async.
antazoey · Dec 13, 2022 · cd4874c · cd4874c
1 parent 42f6a88
commit cd4874c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/benchmarks/mempool.py b/benchmarks/mempool.py
@@ -167,8 +167,8 @@ async def add_spend_bundles(spend_bundles: List[SpendBundle]) -> None:
 
         with enable_profiler(True, f"create-{suffix}"):
             start = monotonic()
-            for i in range(2000):
-                await mempool.create_bundle_from_mempool(bytes32(b"a" * 32))
+            for _ in range(2000):
+                mempool.create_bundle_from_mempool(bytes32(b"a" * 32))
             stop = monotonic()
         print(f"create_bundle_from_mempool time: {stop - start:0.4f}s")
 

diff --git a/chia/clvm/spend_sim.py b/chia/clvm/spend_sim.py
@@ -212,7 +212,7 @@ async def farm_block(
         if (len(self.block_records) > 0) and (self.mempool_manager.mempool.spends):
             peak = self.mempool_manager.peak
             if peak is not None:
-                result = await self.mempool_manager.create_bundle_from_mempool(peak.header_hash, item_inclusion_filter)
+                result = self.mempool_manager.create_bundle_from_mempool(peak.header_hash, item_inclusion_filter)
 
                 if result is not None:
                     bundle, additions, removals = result

diff --git a/chia/full_node/full_node_api.py b/chia/full_node/full_node_api.py
@@ -745,7 +745,7 @@ async def declare_proof_of_space(
                     while not curr_l_tb.is_transaction_block:
                         curr_l_tb = self.full_node.blockchain.block_record(curr_l_tb.prev_hash)
                     try:
-                        mempool_bundle = await self.full_node.mempool_manager.create_bundle_from_mempool(
+                        mempool_bundle = self.full_node.mempool_manager.create_bundle_from_mempool(
                             curr_l_tb.header_hash
                         )
                     except Exception as e:

diff --git a/chia/full_node/mempool_manager.py b/chia/full_node/mempool_manager.py
@@ -165,7 +165,7 @@ def process_mempool_items(
                 additions.extend(item.additions)
         return (spend_bundles, uint64(cost_sum), additions, removals)
 
-    async def create_bundle_from_mempool(
+    def create_bundle_from_mempool(
         self,
         last_tb_header_hash: bytes32,
         item_inclusion_filter: Optional[Callable[[MempoolManager, MempoolItem], bool]] = None,

diff --git a/chia/simulator/full_node_simulator.py b/chia/simulator/full_node_simulator.py
@@ -192,7 +192,7 @@ async def farm_new_transaction_block(
                 else:
                     current_time = False
                     time_per_block = 1
-            mempool_bundle = await self.full_node.mempool_manager.create_bundle_from_mempool(curr.header_hash)
+            mempool_bundle = self.full_node.mempool_manager.create_bundle_from_mempool(curr.header_hash)
             if mempool_bundle is None:
                 spend_bundle = None
             else:
@@ -243,7 +243,7 @@ async def farm_new_block(self, request: FarmNewBlockProtocol, force_wait_for_tim
                 else:
                     current_time = False
                     time_per_block = 1
-            mempool_bundle = await self.full_node.mempool_manager.create_bundle_from_mempool(curr.header_hash)
+            mempool_bundle = self.full_node.mempool_manager.create_bundle_from_mempool(curr.header_hash)
             if mempool_bundle is None:
                 spend_bundle = None
             else:

diff --git a/tests/blockchain/test_blockchain_transactions.py b/tests/blockchain/test_blockchain_transactions.py
@@ -58,7 +58,7 @@ async def test_basic_blockchain_tx(self, two_nodes):
         assert sb is spend_bundle
 
         last_block = blocks[-1]
-        next_spendbundle, additions, removals = await full_node_1.mempool_manager.create_bundle_from_mempool(
+        next_spendbundle, additions, removals = full_node_1.mempool_manager.create_bundle_from_mempool(
             last_block.header_hash
         )
         assert next_spendbundle is not None

diff --git a/tests/core/full_node/test_performance.py b/tests/core/full_node/test_performance.py
@@ -142,7 +142,7 @@ async def test_full_block_performance(self, request: pytest.FixtureRequest, wall
         curr: BlockRecord = peak
         while not curr.is_transaction_block:
             curr = full_node_1.full_node.blockchain.block_record(curr.prev_hash)
-        mempool_bundle = await full_node_1.full_node.mempool_manager.create_bundle_from_mempool(curr.header_hash)
+        mempool_bundle = full_node_1.full_node.mempool_manager.create_bundle_from_mempool(curr.header_hash)
         if mempool_bundle is None:
             spend_bundle = None
         else: