feat: allow send & subscribe symulnateously

okp4 · Aug 10, 2022 · 8fece85 · 8fece85
1 parent 99634d8
commit 8fece85
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/graph/schema.resolvers.go b/graph/schema.resolvers.go
@@ -45,14 +45,13 @@ func (r *subscriptionResolver) Send(ctx context.Context, input model.SendInput)
 		return nil, err
 	}
 
-	if err := r.Faucet.Send(input.ToAddress); err != nil {
+	rawTxResponseChan, err := r.Faucet.Subscribe(input.ToAddress)
+	if err != nil {
 		log.Err(err).Str("toAddress", input.ToAddress).Msg("Could not register send request")
 		return nil, err
 	}
 
 	log.Info().Str("toAddress", input.ToAddress).Msg("Register send request")
-
-	rawTxResponseChan := r.Faucet.Subscribe()
 	txResponseChan := make(chan *model.TxResponse)
 	go func() {
 		for rawTx := range rawTxResponseChan {

diff --git a/pkg/client/faucet.go b/pkg/client/faucet.go
@@ -25,7 +25,7 @@ type Faucet interface {
 	GetFromAddr() types.AccAddress
 	SubmitTx(ctx context.Context) (*types.TxResponse, error)
 	Send(addr string) error
-	Subscribe() <-chan *types.TxResponse
+	Subscribe(addr string) (<-chan *types.TxResponse, error)
 	Close() error
 }
 
@@ -163,11 +163,14 @@ func (f *faucet) Send(addr string) error {
 	return nil
 }
 
-func (f *faucet) Subscribe() <-chan *types.TxResponse {
+func (f *faucet) Subscribe(addr string) (<-chan *types.TxResponse, error) {
+	if err := f.Send(addr); err != nil {
+		return nil, err
+	}
 	txResponseChan := make(chan *types.TxResponse)
 	f.txResponseChans = append(f.txResponseChans, txResponseChan)
 
-	return txResponseChan
+	return txResponseChan, nil
 }
 
 func (f *faucet) Close() error {