certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bridge/pkg/solana: fix package name and remove unused lockChan 

Increase VAA submission timeout.
Change-Id: I5e774f2930e2f0d865d733eee2f0bb01da1b82f3
This commit is contained in:
Leo 2021-03-08 21:25:13 +01:00 committed by Leopold Schabel
parent b04dd1cc2f
commit 45639b18fb
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/cmd/guardiand/bridge.go
View File

@ -410,7 +410,7 @@ func runBridge(cmd *cobra.Command, args []string) {
} }
if err := supervisor.Run(ctx, "solvaa", if err := supervisor.Run(ctx, "solvaa",
solana.NewSolanaVAASubmitter(*agentRPC, lockC, solanaVaaC).Run); err != nil { solana.NewSolanaVAASubmitter(*agentRPC, solanaVaaC).Run); err != nil {
return err return err
} }

2
bridge/pkg/solana/client.go
View File

@ -1,4 +1,4 @@
package ethereum package solana
import ( import (
"bytes" "bytes"

2
bridge/pkg/solana/client_test.go
View File

@ -1,4 +1,4 @@
package ethereum package solana
import ( import (
"encoding/hex" "encoding/hex"

14
bridge/pkg/solana/submitter.go
View File

@ -1,4 +1,4 @@
package ethereum package solana
import ( import (
"context" "context"
@ -42,15 +42,13 @@ func init() {
type ( type (
SolanaVAASubmitter struct { SolanaVAASubmitter struct {
url string url string
vaaChan chan *vaa.VAA
lockChan chan *common.ChainLock
vaaChan chan *vaa.VAA
} }
) )
func NewSolanaVAASubmitter(url string, lockEvents chan *common.ChainLock, vaaQueue chan *vaa.VAA) *SolanaVAASubmitter { func NewSolanaVAASubmitter(url string, vaaQueue chan *vaa.VAA) *SolanaVAASubmitter {
return &SolanaVAASubmitter{url: url, lockChan: lockEvents, vaaChan: vaaQueue} return &SolanaVAASubmitter{url: url, vaaChan: vaaQueue}
} }
func (e *SolanaVAASubmitter) Run(ctx context.Context) error { func (e *SolanaVAASubmitter) Run(ctx context.Context) error {
@ -113,7 +111,7 @@ func (e *SolanaVAASubmitter) Run(ctx context.Context) error {
} }
h := hex.EncodeToString(m.Bytes()) h := hex.EncodeToString(m.Bytes())
timeout, cancel := context.WithTimeout(ctx, 15*time.Second) timeout, cancel := context.WithTimeout(ctx, 120*time.Second)
res, err := c.SubmitVAA(timeout, &agentv1.SubmitVAARequest{Vaa: vaaBytes}) res, err := c.SubmitVAA(timeout, &agentv1.SubmitVAARequest{Vaa: vaaBytes})
cancel() cancel()
if err != nil { if err != nil {