Merge pull request #19 from perun-network/test-funder-fail

Test funder fail

channel/pallet/funder.go

@@ -16,6 +16,7 @@ package pallet
 
 import (
 	"context"
+	"time"
 
 	"github.com/centrifuge/go-substrate-rpc-client/v3/types"
 	"github.com/perun-network/perun-polkadot-backend/channel"
@@ -58,7 +59,9 @@ func (f *Funder) Fund(ctx context.Context, req pchannel.FundingReq) error {
 	}
 
 	// Wait for all Deposited events.
-	return f.waitForFundings(ctx, sub, req)
+	timeoutCtx, cancel := context.WithTimeout(ctx, time.Duration(req.Params.ChallengeDuration)*time.Second)
+	defer cancel()
+	return f.waitForFundings(timeoutCtx, sub, req)
 }
 
 // waitForFundings blocks until either; all fundings of the request were received or
@@ -70,7 +73,6 @@ func (f *Funder) waitForFundings(ctx context.Context, sub *EventSub, req pchanne
 		return err
 	}
 	f.Log().Tracef("Waiting for funding from %d peers", len(fids))
-	defer f.Log().Debug("All peers funded")
 
 	for len(fids) != 0 {
 		select {

channel/pallet/funder_test.go

@@ -60,6 +60,7 @@ func TestFunder_FundMultiple(t *testing.T) {
 func TestFunder_Timeout(t *testing.T) {
 	s := test.NewSetup(t)
 	params, state := s.NewRandomParamAndState()
+	params.ChallengeDuration = 10
 	dSetup := chtest.NewDepositSetup(params, state)
 
 	// Bob did not fund and times out.

client/appchannel_test.go

@@ -18,6 +18,7 @@ import (
 	"context"
 	"math/big"
 	"testing"
+	"time"
 
 	"perun.network/go-perun/channel"
 	"perun.network/go-perun/client"
@@ -54,7 +55,7 @@ func TestAppChannel(t *testing.T) {
 		),
 	}
 
-	ctx, cancel := context.WithTimeout(context.Background(), TestTimeoutBlocks*s.BlockTime)
+	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
 	defer cancel()
 	clienttest.ExecuteTwoPartyTest(ctx, t, roles, execConfig)
 }

client/fund_test.go

@@ -0,0 +1,51 @@
+// Copyright 2022 - See NOTICE file for copyright holders.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package client_test
+
+import (
+	"context"
+	"math/big"
+	"math/rand"
+	"testing"
+	"time"
+
+	dotchannel "github.com/perun-network/perun-polkadot-backend/channel"
+	"github.com/perun-network/perun-polkadot-backend/channel/pallet/test"
+	"perun.network/go-perun/channel"
+	ctest "perun.network/go-perun/client/test"
+	pkgtest "polycry.pt/poly-go/test"
+)
+
+func TestFundRecovery(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
+	defer cancel()
+
+	ctest.TestFundRecovery(
+		ctx,
+		t,
+		ctest.FundSetup{
+			ChallengeDuration: 1,
+			FridaInitBal:      big.NewInt(100000000000000),
+			FredInitBal:       big.NewInt(50000000000000),
+			BalanceDelta:      big.NewInt(1000000000),
+		},
+		func(r *rand.Rand) ([2]ctest.RoleSetup, channel.Asset) {
+			rng := pkgtest.Prng(t)
+			s := test.NewSetup(t)
+			roles := makeRoleSetups(rng, s, [2]string{"Frida", "Fred"})
+			return roles, dotchannel.Asset
+		},
+	)
+}

client/setup_test.go

@@ -19,7 +19,10 @@ import (
 	"time"
 
 	"github.com/perun-network/perun-polkadot-backend/channel/pallet/test"
+	"github.com/perun-network/perun-polkadot-backend/pkg/substrate"
+	"github.com/perun-network/perun-polkadot-backend/wallet"
 	sr25519test "github.com/perun-network/perun-polkadot-backend/wallet/sr25519/test"
+	perunchannel "perun.network/go-perun/channel"
 	clienttest "perun.network/go-perun/client/test"
 	"perun.network/go-perun/watcher/local"
 	"perun.network/go-perun/wire"
@@ -33,6 +36,7 @@ func makeRoleSetups(rng *rand.Rand, s *test.Setup, names [2]string) (setup [2]cl
 		if err != nil {
 			panic(err)
 		}
+		acc := wallet.AsAddr(s.Accs[i].Acc.Address())
 		setup[i] = clienttest.RoleSetup{
 			Name:              names[i],
 			Identity:          netwire.NewRandomAccount(rng),
@@ -43,7 +47,31 @@ func makeRoleSetups(rng *rand.Rand, s *test.Setup, names [2]string) (setup [2]cl
 			Timeout:           TestTimeoutBlocks * time.Second,
 			ChallengeDuration: 5, // 5 sec timeout
 			Watcher:           watcher,
+			BalanceReader:     NewBalanceReader(s.API, acc),
 		}
 	}
 	return
 }
+
+// BalanceReader is a balance reader used for testing. It is associated with a
+// given account.
+type BalanceReader struct {
+	chain *substrate.API
+	acc   wallet.Address
+}
+
+func NewBalanceReader(chain *substrate.API, acc wallet.Address) *BalanceReader {
+	return &BalanceReader{
+		chain: chain,
+		acc:   acc,
+	}
+}
+
+// Balance returns the asset balance of the associated account.
+func (br *BalanceReader) Balance(_ perunchannel.Asset) perunchannel.Bal {
+	accInfo, err := br.chain.AccountInfo(br.acc.AccountID())
+	if err != nil {
+		panic(err)
+	}
+	return accInfo.Free.Int
+}