logos-storage/nim-nitro
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-nitro.git synced 2026-01-04 06:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

By default, return balance of wallet address

Browse Source
This commit is contained in:
Mark Spanbroek 2021-03-22 15:48:04 +01:00
parent 85ff1d3835
commit bd75f78244
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nitro/wallet/wallet.nim
View File

@ -108,7 +108,7 @@ func balance*(wallet: Wallet,
func balance*(wallet: Wallet,
channel: ChannelId,
asset: EthAddress,
address: EthAddress): UInt256 =
address = wallet.address): UInt256 =
wallet.balance(channel, asset, address.toDestination)
func total(state: State, asset: EthAddress): UInt256 =
@ -158,7 +158,7 @@ func acceptPayment*(wallet: var Wallet,
if not (getChannelId(payment.state.channel) == channel):
return void.failure "payment does not match channel"
let currentBalance = wallet.balance(channel, asset, wallet.address)
let currentBalance = wallet.balance(channel, asset)
let futureBalance = payment.state.balance(asset, wallet.destination)
if futureBalance <= currentBalance:
return void.failure "payment should not decrease balance"

9
tests/nitro/testWallet.nim
View File

@ -91,15 +91,14 @@ suite "wallet: making payments":
test "paying updates the channel state":
wallet = Wallet.init(key)
let me = wallet.address
channel = wallet.openLedgerChannel(hub, chainId, nonce, asset, 100.u256).get
check wallet.pay(channel, asset, hub, 1.u256).isOk
check wallet.balance(channel, asset, me) == 99.u256
check wallet.balance(channel, asset) == 99.u256
check wallet.balance(channel, asset, hub) == 1.u256
check wallet.pay(channel, asset, hub, 2.u256).isOk
check wallet.balance(channel, asset, me) == 97.u256
check wallet.balance(channel, asset) == 97.u256
check wallet.balance(channel, asset, hub) == 3.u256
test "paying updates signatures":
@ -162,7 +161,7 @@ suite "wallet: accepting payments":
test "updates channel state":
let payment = payer.pay(channel, asset, receiver.address, 42.u256).get
check receiver.acceptPayment(channel, asset, payer.address, payment).isOk
check receiver.balance(channel, asset, receiver.address) == 42.u256
check receiver.balance(channel, asset) == 42.u256
test "fails when receiver balance is decreased":
let payment1 = payer.pay(channel, asset, receiver.address, 10.u256).get
@ -170,7 +169,7 @@ suite "wallet: accepting payments":
check receiver.acceptPayment(channel, asset, payer.address, payment1).isOk
check receiver.acceptPayment(channel, asset, payer.address, payment2).isOk
check receiver.acceptPayment(channel, asset, payer.address, payment1).isErr
check receiver.balance(channel, asset, receiver.address) == 20
check receiver.balance(channel, asset) == 20
test "fails when the total supply of the asset changes":
var payment = payer.pay(channel, asset, receiver.address, 10.u256).get