✅ [client/test] Test for asynchronous channel funding

Author: matthiasgeihs

client/client_role_test.go

@@ -38,11 +38,21 @@ func NewSetups(rng *rand.Rand, names []string) []ctest.RoleSetup {
 
 	for i := 0; i < n; i++ {
 		acc := wtest.NewRandomAccount(rng)
+
+		// The use of a delayed funder simulates that channel participants may
+		// receive their funding confirmation at different times.
+		var funder channel.Funder
+		if i == 0 {
+			funder = &logFunderWithDelay{log.WithField("role", names[i])}
+		} else {
+			funder = &logFunder{log.WithField("role", names[i])}
+		}
+
 		setup[i] = ctest.RoleSetup{
 			Name:        names[i],
 			Identity:    acc,
 			Bus:         bus,
-			Funder:      &logFunder{log.WithField("role", names[i])},
+			Funder:      funder,
 			Adjudicator: &logAdjudicator{log.WithField("role", names[i]), sync.RWMutex{}, nil},
 			Wallet:      wtest.NewWallet(),
 			Timeout:     roleOperationTimeout,
@@ -57,6 +67,10 @@ type (
 		log log.Logger
 	}
 
+	logFunderWithDelay struct {
+		log log.Logger
+	}
+
 	logAdjudicator struct {
 		log         log.Logger
 		mu          sync.RWMutex
@@ -69,6 +83,12 @@ func (f *logFunder) Fund(_ context.Context, req channel.FundingReq) error {
 	return nil
 }
 
+func (f *logFunderWithDelay) Fund(_ context.Context, req channel.FundingReq) error {
+	time.Sleep(100 * time.Millisecond)
+	f.log.Infof("Funding: %v", req)
+	return nil
+}
+
 func (a *logAdjudicator) Register(_ context.Context, req channel.AdjudicatorReq) error {
 	a.log.Infof("Register: %v", req)
 	e := channel.NewRegisteredEvent(

client/test/alice.go

@@ -46,8 +46,6 @@ func (r *Alice) Execute(cfg ExecConfig) {
 func (r *Alice) exec(_cfg ExecConfig, ch *paymentChannel) {
 	cfg := _cfg.(*AliceBobExecConfig)
 	we, them := r.Idxs(cfg.Peers())
-	// 1st stage - channel controller set up
-	r.waitStage()
 
 	// 1st Alice receives some updates from Bob
 	for i := 0; i < cfg.NumPayments[them]; i++ {

client/test/bob.go

@@ -38,9 +38,6 @@ func (r *Bob) exec(_cfg ExecConfig, ch *paymentChannel, propHandler *acceptNextP
 	cfg := _cfg.(*AliceBobExecConfig)
 	we, them := r.Idxs(cfg.Peers())
 
-	// 1st stage - channel controller set up
-	r.waitStage()
-
 	// 1st Bob sends some updates to Alice
 	for i := 0; i < cfg.NumPayments[we]; i++ {
 		ch.sendTransfer(cfg.TxAmounts[we], fmt.Sprintf("Bob#%d", i))

client/test/proposer.go

@@ -36,6 +36,10 @@ func (r *Proposer) Execute(cfg ExecConfig, exec func(ExecConfig, *paymentChannel
 	rng := pkgtest.Prng(r.t, "proposer")
 	assert := assert.New(r.t)
 
+	// ignore proposal handler since Proposer doesn't accept any incoming channels
+	_, wait := r.GoHandle(rng)
+	defer wait()
+
 	prop := r.LedgerChannelProposal(rng, cfg)
 	ch, err := r.ProposeChannel(prop)
 	assert.NoError(err)
@@ -45,10 +49,6 @@ func (r *Proposer) Execute(cfg ExecConfig, exec func(ExecConfig, *paymentChannel
 	}
 	r.log.Infof("New Channel opened: %v", ch.Channel)
 
-	// ignore proposal handler since Proposer doesn't accept any incoming channels
-	_, wait := r.GoHandle(rng)
-	defer wait()
-
 	exec(cfg, ch)
 
 	ch.Close() // May or may not already be closed due to channelConn closing.