fix destructure error (#21)

irulast · Aug 1, 2023 · faaa099 · faaa099
1 parent bc51ef1
commit faaa099
Showing 1 changed file with 9 additions and 19 deletions.
diff --git a/chia/rpc/full_node_rpc_api.py b/chia/rpc/full_node_rpc_api.py
@@ -626,26 +626,20 @@ async def attach_spends_to_coins(self, coin_records: List[CoinRecord]):
                 block_generator: Optional[BlockGenerator] = await self.service.blockchain.get_block_generator(block)
                 assert block_generator is not None
                 if coin_record.spent_block_index > 0:
-                    error, puzzle, solution = get_puzzle_and_solution_for_coin(
+                    spend_info = get_puzzle_and_solution_for_coin(
                         block_generator, coin_record.coin
                     )
-                    if error is None:
-                        coin_spend = CoinSpend(coin_record.coin, puzzle, solution)
-                        coin_record_dictionary['coin_spend'] = coin_spend
-                    else:
-                        error_text = f"error getting spend for SPENT COIN({coin_record.name.hex()}): {error}"
-                        log.error(error_text)
+                    coin_spend = CoinSpend(coin_record.coin, spend_info.puzzle, spend_info.solution)
+                    coin_record_dictionary['coin_spend'] = coin_spend
+
                 elif coin_id in child_id_to_parent_coin_dict:
                     parent_coin=child_id_to_parent_coin_dict[coin_id]
 
-                    error, puzzle, solution = get_puzzle_and_solution_for_coin(
+                    spend_info = get_puzzle_and_solution_for_coin(
                         block_generator, parent_coin
                     )
-                    if error is None:
-                        parent_spend = CoinSpend(parent_coin, puzzle, solution)
-                        coin_record_dictionary['parent_coin_spend'] = parent_spend
-                    else:
-                        log.error(f"error getting parent spend for unspent coin({coin_record.name.hex()}): {error}")
+                    parent_spend = CoinSpend(parent_coin, spend_info.puzzle, spend_info.solution)
+                    coin_record_dictionary['parent_coin_spend'] = parent_spend
 
 
             coin_record_with_spends.append(coin_record_dictionary)
@@ -942,15 +936,11 @@ async def get_puzzles_and_solutions_by_names(self, request: Dict[str, Any]) -> E
             else:
                 block_generator: Optional[BlockGenerator] = await self.service.blockchain.get_block_generator(block)
                 assert block_generator is not None
-                error, puzzle, solution = get_puzzle_and_solution_for_coin(
+                spend_info = get_puzzle_and_solution_for_coin(
                     block_generator, coin_record.coin
                 )
-                if error is not None:
-                    raise ValueError(f"Error: {error}")
 
-
-
-                coin_spends[coin_name.hex()] = CoinSpend(coin_record.coin, puzzle, solution).to_json_dict()
+                coin_spends[coin_name.hex()] = CoinSpend(coin_record.coin, spend_info.puzzle, spend_info.solution).to_json_dict()
 
         return {'coin_solutions': coin_spends}