-ran black

-made error new return

Author: matt-o-how

src/wallet/cc_wallet/cc_wallet.py

@@ -200,7 +200,9 @@ async def get_confirmed_balance(self) -> uint64:
 
     async def get_unconfirmed_balance(self) -> uint64:
         confirmed = await self.get_confirmed_balance()
-        unconfirmed_tx: List[TransactionRecord] = await self.wallet_state_manager.tx_store.get_unconfirmed_for_wallet(
+        unconfirmed_tx: List[
+            TransactionRecord
+        ] = await self.wallet_state_manager.tx_store.get_unconfirmed_for_wallet(
             self.wallet_info.id
         )
         addition_amount = 0
@@ -734,9 +736,7 @@ async def cc_spend(
             wallet_id=self.wallet_info.id,
             sent_to=[],
         )
-        await self.wallet_state_manager.add_pending_transaction(
-            tx_record
-        )
+        await self.wallet_state_manager.add_pending_transaction(tx_record)
 
         return spend_bundle
 
@@ -783,7 +783,9 @@ async def generate_new_coloured_coin(self, amount: uint64) -> Optional[SpendBund
         cc_puzzle = cc_wallet_puzzles.cc_make_puzzle(cc_inner, cc_core)
         cc_puzzle_hash = cc_puzzle.get_tree_hash()
 
-        tx_record: Optional[TransactionRecord] = await self.standard_wallet.generate_signed_transaction(
+        tx_record: Optional[
+            TransactionRecord
+        ] = await self.standard_wallet.generate_signed_transaction(
             amount, cc_puzzle_hash, uint64(0), origin_id, coins
         )
         self.log.warning(f"cc_puzzle_hash is {cc_puzzle_hash}")

src/wallet/trade_manager.py

@@ -45,7 +45,7 @@ async def create(
 
     async def create_offer_for_ids(
         self, offer: Dict[int, int]
-    ) -> Tuple[bool, Optional[SpendBundle]]:
+    ) -> Tuple[bool, Optional[SpendBundle], Optional[str]]:
         """
         Offer is dictionary of wallet ids and amount
         """
@@ -69,7 +69,9 @@ async def create_offer_for_ids(
                         ] = await wallet.generate_zero_val_coin(False, to_exclude)
 
                         if zero_spend_bundle is None:
-                            raise Exception("Failed to generate offer. Zero value coin not created.")
+                            raise Exception(
+                                "Failed to generate offer. Zero value coin not created."
+                            )
                         if spend_bundle is None:
                             spend_bundle = zero_spend_bundle
                         else:
@@ -100,7 +102,7 @@ async def create_offer_for_ids(
                         amount, to_exclude
                     )
                 else:
-                    return False, None
+                    return False, None, "unssuported wallet type"
                 if new_spend_bundle.removals() == [] or new_spend_bundle is None:
                     raise Exception(f"Wallet {id} was unable to create offer.")
                 if spend_bundle is None:
@@ -110,9 +112,9 @@ async def create_offer_for_ids(
                         [spend_bundle, new_spend_bundle]
                     )
 
-            return True, spend_bundle
+            return True, spend_bundle, None
         except Exception as e:
-            return False, str(e)
+            return False, None, str(e)
 
     def write_offer_to_disk(self, file_path: Path, offer: SpendBundle):
         if offer is not None:
@@ -229,7 +231,8 @@ async def respond_to_offer(self, file_path: Path) -> Tuple[bool, Optional[str]]:
                             colour
                         )
                     unspent = await self.wallet_state_manager.get_spendable_coins_for_wallet(
-                        wallets[colour].wallet_info.id)
+                        wallets[colour].wallet_info.id
+                    )
                     if coinsol.coin in [record.coin for record in unspent]:
                         return False, "can't respond to own offer"
                     innerpuzzlereveal = solution.rest().rest().rest().first()
@@ -271,7 +274,9 @@ async def respond_to_offer(self, file_path: Path) -> Tuple[bool, Optional[str]]:
                     coinsols.append(coinsol)
             else:
                 # standard chia coin
-                unspent = await self.wallet_state_manager.get_spendable_coins_for_wallet(1)
+                unspent = await self.wallet_state_manager.get_spendable_coins_for_wallet(
+                    1
+                )
                 if coinsol.coin in [record.coin for record in unspent]:
                     return False, "can't respond to own offer"
                 if chia_discrepancy is None:

src/wallet/transaction_record.py

@@ -36,4 +36,8 @@ class TransactionRecord(Streamable):
     def name(self) -> bytes32:
         if self.spend_bundle:
             return self.spend_bundle.name()
-        return std_hash(bytes(self.to_puzzle_hash) + bytes(self.created_at_time) + bytes(self.amount))
+        return std_hash(
+            bytes(self.to_puzzle_hash)
+            + bytes(self.created_at_time)
+            + bytes(self.amount)
+        )

src/wallet/wallet_state_manager.py

@@ -403,7 +403,9 @@ async def get_unconfirmed_balance(self, wallet_id) -> uint64:
         transactions.
         """
         confirmed = await self.get_confirmed_balance_for_wallet(wallet_id)
-        unconfirmed_tx: List[TransactionRecord] = await self.tx_store.get_unconfirmed_for_wallet(wallet_id)
+        unconfirmed_tx: List[
+            TransactionRecord
+        ] = await self.tx_store.get_unconfirmed_for_wallet(wallet_id)
         removal_amount = 0
 
         for record in unconfirmed_tx:
@@ -453,9 +455,9 @@ async def coin_removed(self, coin: Coin, index: uint32):
 
         await self.wallet_store.set_spent(coin.name(), index)
 
-        unconfirmed_record: List[TransactionRecord] = await self.tx_store.unconfirmed_with_removal_coin(
-            coin.name()
-        )
+        unconfirmed_record: List[
+            TransactionRecord
+        ] = await self.tx_store.unconfirmed_with_removal_coin(coin.name())
         for unconfirmed in unconfirmed_record:
             await self.tx_store.set_confirmed(unconfirmed.name(), index)
 

src/wallet/websocket_server.py

@@ -455,12 +455,14 @@ async def get_discrepancies_for_offer(self, websocket, request, response_api):
     async def create_offer_for_ids(self, websocket, request, response_api):
         offer = request["ids"]
         file_name = request["filename"]
-        success, spend_bundle = await self.trade_manager.create_offer_for_ids(offer)
+        success, spend_bundle, error = await self.trade_manager.create_offer_for_ids(
+            offer
+        )
         if success:
             self.trade_manager.write_offer_to_disk(Path(file_name), spend_bundle)
             response = {"success": success}
         else:
-            response = {"success": success, "reason": spend_bundle}
+            response = {"success": success, "reason": error}
 
         return await websocket.send(format_response(response_api, response))