Merge pull request #130 from ipfs/release/v0.5.2

hannahhoward · web-flow · commit 4372a80fc4e6 · 2020-12-10T20:02:44.000-08:00
docs(CHANGELOG): update for v0.5.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,24 @@
 # go-graphsync changelog
 
+# go-graphsync 0.5.2
+
+Minor release resolves bugs in notification system
+
+### Changelog
+
+- github.com/ipfs/go-graphsync:
+  - RegisterNetworkErrorListener should fire when there's an error connecting to the peer (#127) ([ipfs/go-graphsync#127](https://github.com/ipfs/go-graphsync/pull/127))
+  - Permit multiple data subscriptions per original topic (#128) ([ipfs/go-graphsync#128](https://github.com/ipfs/go-graphsync/pull/128))
+  - release: v0.5.1 (#123) ([ipfs/go-graphsync#123](https://github.com/ipfs/go-graphsync/pull/123))
+
+### Contributors
+
+| Contributor | Commits | Lines ± | Files Changed |
+|-------------|---------|---------|---------------|
+| dirkmc | 2 | +272/-185 | 10 |
+| Alex Cruikshank | 1 | +188/-110 | 12 |
+| Hannah Howard | 1 | +23/-6 | 3 |
+
 # go-graphsync 0.5.1
 
 ### Changelog
diff --git a/impl/graphsync_test.go b/impl/graphsync_test.go
@@ -1043,7 +1043,6 @@ func TestGraphsyncBlockListeners(t *testing.T) {
 	require.Equal(t, blockChainLength, blocksSent)
 }
 
-
 type gsTestData struct {
 	mn                       mocknet.Mocknet
 	ctx                      context.Context
diff --git a/notifications/data_subscriber.go b/notifications/data_subscriber.go
@@ -3,17 +3,17 @@ package notifications
 import "sync"
 
 type TopicDataSubscriber struct {
-	idMapLk        sync.RWMutex
-	data           map[Topic][]TopicData
+	idMapLk sync.RWMutex
+	data    map[Topic][]TopicData
 	Subscriber
 }
 
 // NewTopicDataSubscriber produces a subscriber that will transform
 // events and topics before passing them on to the given subscriber
 func NewTopicDataSubscriber(sub Subscriber) *TopicDataSubscriber {
 	return &TopicDataSubscriber{
-		Subscriber:     sub,
-		data:           make(map[Topic][]TopicData),
+		Subscriber: sub,
+		data:       make(map[Topic][]TopicData),
 	}
 }
 
diff --git a/notifications/types.go b/notifications/types.go
@@ -36,7 +36,7 @@ type EventTransform func(Event) Event
 // Notifee is a topic data subscriber plus a set of data you want to add to any topics subscribed to
 // (used to call SubscribeWithData to inject data when events for a given topic emit)
 type Notifee struct {
-	Data      TopicData
+	Data       TopicData
 	Subscriber *TopicDataSubscriber
 }
 
diff --git a/requestmanager/requestmanager.go b/requestmanager/requestmanager.go
@@ -6,9 +6,6 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/ipfs/go-graphsync/listeners"
-	"github.com/ipfs/go-graphsync/messagequeue"
-
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipfs/go-cid"
 	logging "github.com/ipfs/go-log"
@@ -20,7 +17,9 @@ import (
 	"github.com/ipfs/go-graphsync/cidset"
 	"github.com/ipfs/go-graphsync/dedupkey"
 	ipldutil "github.com/ipfs/go-graphsync/ipldutil"
+	"github.com/ipfs/go-graphsync/listeners"
 	gsmsg "github.com/ipfs/go-graphsync/message"
+	"github.com/ipfs/go-graphsync/messagequeue"
 	"github.com/ipfs/go-graphsync/metadata"
 	"github.com/ipfs/go-graphsync/notifications"
 	"github.com/ipfs/go-graphsync/requestmanager/executor"
diff --git a/requestmanager/requestmanager_test.go b/requestmanager/requestmanager_test.go
@@ -7,8 +7,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ipfs/go-graphsync/listeners"
-
 	blocks "github.com/ipfs/go-block-format"
 	"github.com/ipld/go-ipld-prime"
 	cidlink "github.com/ipld/go-ipld-prime/linking/cid"
@@ -18,6 +16,7 @@ import (
 	"github.com/ipfs/go-graphsync"
 	"github.com/ipfs/go-graphsync/cidset"
 	"github.com/ipfs/go-graphsync/dedupkey"
+	"github.com/ipfs/go-graphsync/listeners"
 	gsmsg "github.com/ipfs/go-graphsync/message"
 	"github.com/ipfs/go-graphsync/metadata"
 	"github.com/ipfs/go-graphsync/notifications"
diff --git a/responsemanager/peerresponsemanager/peerresponsesender.go b/responsemanager/peerresponsemanager/peerresponsesender.go
@@ -467,7 +467,7 @@ func (prs *peerResponseSender) sendResponseMessages() {
 			continue
 		}
 		notifications.SubscribeWithData(prs.publisher, builder.Topic(), notifications.Notifee{
-			Data:      builder.BlockSize(),
+			Data:       builder.BlockSize(),
 			Subscriber: prs.allocatorSubscriber,
 		})
 		responses, blks, err := builder.Build()
@@ -476,7 +476,7 @@ func (prs *peerResponseSender) sendResponseMessages() {
 		}
 
 		prs.peerHandler.SendResponse(prs.p, responses, blks, notifications.Notifee{
-			Data:      builder.Topic(),
+			Data:       builder.Topic(),
 			Subscriber: prs.subscriber,
 		})
 
diff --git a/testutil/testnotifications.go b/testutil/testnotifications.go
@@ -88,7 +88,7 @@ func (nv *NotifeeVerifier) ExpectClose(ctx context.Context, t *testing.T) {
 func NewTestNotifee(data notifications.TopicData, bufferSize int) (notifications.Notifee, *NotifeeVerifier) {
 	subscriber := NewTestSubscriber(bufferSize)
 	return notifications.Notifee{
-			Data:      data,
+			Data:       data,
 			Subscriber: notifications.NewTopicDataSubscriber(subscriber),
 		}, &NotifeeVerifier{
 			expectedTopic: data,

Original file line number	Diff line number	Diff line change
`@@ -1043,7 +1043,6 @@ func TestGraphsyncBlockListeners(t *testing.T) {`
`1043`	`1043`	`require.Equal(t, blockChainLength, blocksSent)`
`1044`	`1044`	`}`
`1045`	`1045`
`1046`		`-`
`1047`	`1046`	`type gsTestData struct {`
`1048`	`1047`	`mn mocknet.Mocknet`
`1049`	`1048`	`ctx context.Context`
Original file line number	Diff line number	Diff line change
`@@ -3,17 +3,17 @@ package notifications`
`3`	`3`	`import "sync"`
`4`	`4`
`5`	`5`	`type TopicDataSubscriber struct {`
`6`		`- idMapLk sync.RWMutex`
`7`		`- data map[Topic][]TopicData`
	`6`	`+ idMapLk sync.RWMutex`
	`7`	`+ data map[Topic][]TopicData`
`8`	`8`	`Subscriber`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`// NewTopicDataSubscriber produces a subscriber that will transform`
`12`	`12`	`// events and topics before passing them on to the given subscriber`
`13`	`13`	`func NewTopicDataSubscriber(sub Subscriber) *TopicDataSubscriber {`
`14`	`14`	`return &TopicDataSubscriber{`
`15`		`- Subscriber: sub,`
`16`		`- data: make(map[Topic][]TopicData),`
	`15`	`+ Subscriber: sub,`
	`16`	`+ data: make(map[Topic][]TopicData),`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ type EventTransform func(Event) Event`
`36`	`36`	`// Notifee is a topic data subscriber plus a set of data you want to add to any topics subscribed to`
`37`	`37`	`// (used to call SubscribeWithData to inject data when events for a given topic emit)`
`38`	`38`	`type Notifee struct {`
`39`		`- Data TopicData`
	`39`	`+ Data TopicData`
`40`	`40`	`Subscriber *TopicDataSubscriber`
`41`	`41`	`}`
`42`	`42`