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

Increase VAA submission timeout.
Change-Id: I5e774f2930e2f0d865d733eee2f0bb01da1b82f3

bridge/cmd/guardiand/bridge.go

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

bridge/pkg/solana/client.go

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

bridge/pkg/solana/client_test.go

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

bridge/pkg/solana/submitter.go

@@ -1,4 +1,4 @@
-package ethereum
+package solana
 
 import (
 	"context"
@@ -42,15 +42,13 @@ func init() {
 
 type (
 	SolanaVAASubmitter struct {
-		url string
-
-		lockChan chan *common.ChainLock
-		vaaChan  chan *vaa.VAA
+		url     string
+		vaaChan chan *vaa.VAA
 	}
 )
 
-func NewSolanaVAASubmitter(url string, lockEvents chan *common.ChainLock, vaaQueue chan *vaa.VAA) *SolanaVAASubmitter {
-	return &SolanaVAASubmitter{url: url, lockChan: lockEvents, vaaChan: vaaQueue}
+func NewSolanaVAASubmitter(url string, vaaQueue chan *vaa.VAA) *SolanaVAASubmitter {
+	return &SolanaVAASubmitter{url: url, vaaChan: vaaQueue}
 }
 
 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())
 
-				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})
 				cancel()
 				if err != nil {