logos-storage/nim-nitro
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-nitro.git synced 2026-01-05 15:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ?[] instead of catching KeyError

Browse Source
This commit is contained in:
Mark Spanbroek 2021-03-22 14:12:01 +01:00
parent c878ce6588
commit 24c83838c7
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nitro/wallet/wallet.nim
View File

@ -66,10 +66,7 @@ func acceptChannel*(wallet: var Wallet, signed: SignedState): ?!ChannelId =
wallet.createChannel(signed).success
func latestSignedState*(wallet: Wallet, channel: ChannelId): ?SignedState =
try:
wallet.channels[channel].some
except KeyError:
SignedState.none
wallet.channels?[channel]
func state*(wallet: Wallet, channel: ChannelId): ?State =
wallet.latestSignedState(channel)?.state
@ -90,9 +87,9 @@ func balance(state: State,
asset: EthAddress,
destination: Destination): UInt256 =
if balances =? state.outcome.balances(asset):
try:
balances[destination]
except KeyError:
if balance =? (balances?[destination]):
balance
else:
0.u256
else:
0.u256
@ -133,12 +130,9 @@ func pay*(wallet: var Wallet,
if var state =? wallet.state(channel):
if var balances =? state.outcome.balances(asset):
?balances.move(wallet.destination, receiver, amount)
try:
state.outcome.update(asset, balances)
wallet.updateChannel(SignedState(state: state))
ok(wallet.channels[channel])
except KeyError as error:
SignedState.failure error
state.outcome.update(asset, balances)
wallet.updateChannel(SignedState(state: state))
ok(wallet.channels?[channel].get)
else:
SignedState.failure "asset not found"
else: