noisymime
/
chia-blockchain
mirror of https://github.com/noisymime/chia-blockchain.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes lint

This commit is contained in:
Will Bendick 2020-09-28 16:07:44 -07:00 committed by Gene Hoffman
parent a17f6814b5
commit 9070f26717
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/rpc/wallet_rpc_api.py
View File

@ -366,7 +366,7 @@ class WalletRpcApi:
uint64(int(request["limit"])), uint64(int(request["limit"])),
request["pubkey"], request["pubkey"],
uint64(int(request["amount"])), uint64(int(request["amount"])),
uint64(int(request["fee"])) if "fee" in request else 0 uint64(int(request["fee"])) if "fee" in request else uint64(0),
) )
asyncio.ensure_future(self._create_backup_and_upload(host)) asyncio.ensure_future(self._create_backup_and_upload(host))
assert rl_admin.rl_info.admin_pubkey is not None assert rl_admin.rl_info.admin_pubkey is not None

13
src/wallet/rl_wallet/rl_wallet.py
View File

@ -172,7 +172,12 @@ class RLWallet:
return self.wallet_info.id return self.wallet_info.id
async def admin_create_coin( async def admin_create_coin(
self, interval: uint64, limit: uint64, user_pubkey: str, amount: uint64, fee: uint64 self,
interval: uint64,
limit: uint64,
user_pubkey: str,
amount: uint64,
fee: uint64,
) -> bool: ) -> bool:
coins = await self.wallet_state_manager.main_wallet.select_coins(amount) coins = await self.wallet_state_manager.main_wallet.select_coins(amount)
if coins is None: if coins is None:
@ -548,7 +553,7 @@ class RLWallet:
rl_parent.amount, rl_parent.amount,
self.rl_info.interval, self.rl_info.interval,
self.rl_info.limit, self.rl_info.limit,
fee fee,
) )
spends.append((puzzle, CoinSolution(coin, solution))) spends.append((puzzle, CoinSolution(coin, solution)))
@ -630,7 +635,9 @@ class RLWallet:
self.rl_info.rl_origin.name(), self.rl_info.rl_origin.name(),
self.rl_info.admin_pubkey, self.rl_info.admin_pubkey,
) )
solution = make_clawback_solution(clawback_puzzle_hash, clawback_coin.amount, fee) solution = make_clawback_solution(
clawback_puzzle_hash, clawback_coin.amount, fee
)
spends.append((puzzle, CoinSolution(coin, solution))) spends.append((puzzle, CoinSolution(coin, solution)))
return spends return spends

6
tests/rl_wallet/test_rl_rpc.py
View File

@ -172,7 +172,9 @@ class TestRLWallet:
await time_out_assert(15, check_balance, 90, api_user, user_wallet_id) await time_out_assert(15, check_balance, 90, api_user, user_wallet_id)
await time_out_assert(15, receiving_wallet.get_spendable_balance, 108) await time_out_assert(15, receiving_wallet.get_spendable_balance, 108)
val = await api_admin.send_clawback_transaction({"wallet_id": admin_wallet_id, "fee": 11}) val = await api_admin.send_clawback_transaction(
{"wallet_id": admin_wallet_id, "fee": 11}
)
await time_out_assert( await time_out_assert(
15, is_transaction_in_mempool, True, api_admin, val["transaction_id"] 15, is_transaction_in_mempool, True, api_admin, val["transaction_id"]
) )
@ -181,4 +183,4 @@ class TestRLWallet:
await time_out_assert(15, check_balance, 0, api_user, user_wallet_id) await time_out_assert(15, check_balance, 0, api_user, user_wallet_id)
await time_out_assert(15, check_balance, 0, api_admin, user_wallet_id) await time_out_assert(15, check_balance, 0, api_admin, user_wallet_id)
final_balance = await wallet.get_confirmed_balance() final_balance = await wallet.get_confirmed_balance()
assert final_balance == fund_owners_initial_balance - 129 assert final_balance == fund_owners_initial_balance - 129