Skip to content

Fix Multi-Adjudicator Subscription #366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cryptphil merged 3 commits into from
Aug 1, 2022
Merged

Fix Multi-Adjudicator Subscription #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e86501e
channel/multi/subscription: Fix Subscribe
cryptphil Aug 1, 2022
87db745
client/test/multiledger_dispute: Close channels after settling
cryptphil Aug 1, 2022
4969d89
multi.AdjudicatorSubscription: Return when done
matthiasgeihs Aug 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions channel/multi/subscription.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func (a *Adjudicator) Subscribe(ctx context.Context, chID channel.ID) (channel.A
events: make(chan channel.AdjudicatorEvent),
errors: make(chan error),
subs: []channel.AdjudicatorSubscription{},
done: make(chan struct{}),
}

for _, la := range a.adjudicators {
Expand All @@ -37,7 +38,13 @@ func (a *Adjudicator) Subscribe(ctx context.Context, chID channel.ID) (channel.A
asub.subs = append(asub.subs, sub)

go func() {
asub.events <- sub.Next()
for {
select {
case asub.events <- sub.Next():
case <-asub.done:
return
}
}
}()

go func() {
Expand All @@ -53,11 +60,17 @@ type AdjudicatorSubscription struct {
subs []channel.AdjudicatorSubscription
events chan channel.AdjudicatorEvent
errors chan error
done chan struct{}
}

// Next returns the next event.
func (s *AdjudicatorSubscription) Next() channel.AdjudicatorEvent {
return <-s.events
select {
case e := <-s.events:
return e
case <-s.done:
return nil
}
}

// Err blocks until an error occurred and returns it.
Expand All @@ -76,5 +89,6 @@ func (s *AdjudicatorSubscription) Close() error {
for _, sub := range s.subs {
sub.Close()
}
close(s.done)
return nil
}
5 changes: 5 additions & 0 deletions client/test/multiledger_dispute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"perun.network/go-perun/channel"
"perun.network/go-perun/client"
"perun.network/go-perun/wire"
Expand Down Expand Up @@ -131,6 +132,10 @@ func TestMultiLedgerDispute(
err = chBobAlice.Settle(ctx, false)
require.NoError(err)

// Close the channels.
require.NoError(chAliceBob.Close())
require.NoError(chBobAlice.Close())

// Check final balances.
balancesAfter := channel.Balances{
{
Expand Down