cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

fix: paych test voucher total comparison

Browse Source
This commit is contained in:
Dirk McCormick 2020-07-22 16:09:46 -04:00
parent 53bb57882d
commit 90e29a7bee
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
api/test/paych.go
View File

@ -66,12 +66,8 @@ func TestPaymentChannels(t *testing.T, b APIBuilder, blocktime time.Duration) {
t.Fatal(err) t.Fatal(err)
} }
initBalance, err := paymentCreator.WalletBalance(ctx, createrAddr) channelAmt := int64(100000)
if err != nil { channelInfo, err := paymentCreator.PaychGet(ctx, createrAddr, receiverAddr, abi.NewTokenAmount(channelAmt))
t.Fatal(err)
}
channelInfo, err := paymentCreator.PaychGet(ctx, createrAddr, receiverAddr, abi.NewTokenAmount(100000))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -83,6 +79,7 @@ func TestPaymentChannels(t *testing.T, b APIBuilder, blocktime time.Duration) {
t.Fatal(err) t.Fatal(err)
} }
channel := params.RobustAddress channel := params.RobustAddress
// allocate three lanes // allocate three lanes
var lanes []uint64 var lanes []uint64
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
@ -93,7 +90,9 @@ func TestPaymentChannels(t *testing.T, b APIBuilder, blocktime time.Duration) {
lanes = append(lanes, lane) lanes = append(lanes, lane)
} }
// make two vouchers each for each lane, then save on the other side // Make two vouchers each for each lane, then save on the other side
// Note that the voucher with a value of 2000 has a higher nonce, so it
// supersedes the voucher with a value of 1000
for _, lane := range lanes { for _, lane := range lanes {
vouch1, err := paymentCreator.PaychVoucherCreate(ctx, channel, abi.NewTokenAmount(1000), lane) vouch1, err := paymentCreator.PaychVoucherCreate(ctx, channel, abi.NewTokenAmount(1000), lane)
if err != nil { if err != nil {
@ -130,6 +129,11 @@ func TestPaymentChannels(t *testing.T, b APIBuilder, blocktime time.Duration) {
t.Fatal("Unable to settle payment channel") t.Fatal("Unable to settle payment channel")
} }
creatorPreCollectBalance, err := paymentCreator.WalletBalance(ctx, createrAddr)
if err != nil {
t.Fatal(err)
}
// wait for the receiver to submit their vouchers // wait for the receiver to submit their vouchers
ev := events.NewEvents(ctx, paymentCreator) ev := events.NewEvents(ctx, paymentCreator)
preds := state.NewStatePredicates(paymentCreator) preds := state.NewStatePredicates(paymentCreator)
@ -176,20 +180,21 @@ func TestPaymentChannels(t *testing.T, b APIBuilder, blocktime time.Duration) {
t.Fatal("unable to collect on payment channel") t.Fatal("unable to collect on payment channel")
} }
// Finally, check the balance for the receiver and creator // Finally, check the balance for the creator
currentCreatorBalance, err := paymentCreator.WalletBalance(ctx, createrAddr) currentCreatorBalance, err := paymentCreator.WalletBalance(ctx, createrAddr)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !big.Sub(initBalance, currentCreatorBalance).Equals(abi.NewTokenAmount(7000)) {
t.Fatal("did not send correct funds from creator") // The highest nonce voucher that the creator sent on each lane is 2000
} totalVouchers := int64(len(lanes) * 2000)
currentReceiverBalance, err := paymentReceiver.WalletBalance(ctx, receiverAddr) // When receiver submits the tokens to the chain, creator should get a
if err != nil { // refund on the remaining balance, which is
t.Fatal(err) // channel amount - total voucher value
} expectedRefund := channelAmt - totalVouchers
if !currentReceiverBalance.Equals(abi.NewTokenAmount(7000)) { delta := big.Sub(currentCreatorBalance, creatorPreCollectBalance)
t.Fatal("did not receive correct funds on receiver") if !delta.Equals(abi.NewTokenAmount(expectedRefund)) {
t.Fatalf("did not send correct funds from creator: expected %d, got %d", expectedRefund, delta)
} }
// shut down mining // shut down mining