Merge pull request #239 from moul/dev/moul/refactor-eventstream

feat(core): refactor EventStream to support pubsub patterns
berty · Sep 11, 2018 · 459892b · 459892b
2 parents 087083f + 656175d
commit 459892b
Show file tree

Hide file tree

Showing 19 changed files with 599 additions and 143 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,6 +3,7 @@
 
 # Collapse generated files on GitHub
 *.gen.go linguist-generated
+*.gen.graphql linguist-generated
 *.pb.go linguist-generated
 
 # Reduce conflicts on markdown files

diff --git a/client/go/bot/bot.go b/client/go/bot/bot.go
@@ -34,7 +34,7 @@ func New(opts ...Option) (*Bot, error) {
 
 func (b *Bot) Start() error {
 	ctx := context.Background()
-	stream, err := b.client.Node().EventStream(ctx, &node.Void{})
+	stream, err := b.client.Node().EventStream(ctx, &node.EventStreamInput{})
 	if err != nil {
 		return err
 	}

diff --git a/core/api/client/berty.node.service.gen.go b/core/api/client/berty.node.service.gen.go
diff --git a/core/api/client/jsonclient/berty.node.service.gen.go b/core/api/client/jsonclient/berty.node.service.gen.go
diff --git a/core/api/node/graphql/graph/graph.gen.go b/core/api/node/graphql/graph/graph.gen.go
diff --git a/core/api/node/graphql/model/model.gen.go b/core/api/node/graphql/model/model.gen.go
diff --git a/core/api/node/graphql/resolver.go b/core/api/node/graphql/resolver.go
@@ -195,7 +195,7 @@ type subscriptionResolver struct{ *Resolver }
 
 func (r *subscriptionResolver) EventStream(ctx context.Context) (<-chan *model.BertyP2pEvent, error) {
 	ce := make(chan *model.BertyP2pEvent)
-	req := &service.Void{}
+	req := &service.EventStreamInput{}
 	stream, err := r.client.EventStream(ctx, req)
 	if err != nil {
 		return nil, err

diff --git a/core/api/node/graphql/service.gen.graphql b/core/api/node/graphql/service.gen.graphql