From 45639b18fb5771e466dbc0242224919596221067 Mon Sep 17 00:00:00 2001
From: Leo <leo@certus.one>
Date: Mon, 8 Mar 2021 21:25:13 +0100
Subject: [PATCH] bridge/pkg/solana: fix package name and remove unused
 lockChan

Increase VAA submission timeout.
Change-Id: I5e774f2930e2f0d865d733eee2f0bb01da1b82f3
---
 bridge/cmd/guardiand/bridge.go   |  2 +-
 bridge/pkg/solana/client.go      |  2 +-
 bridge/pkg/solana/client_test.go |  2 +-
 bridge/pkg/solana/submitter.go   | 14 ++++++--------
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/bridge/cmd/guardiand/bridge.go b/bridge/cmd/guardiand/bridge.go
index 748456686..48dce0928 100644
--- a/bridge/cmd/guardiand/bridge.go
+++ b/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
 		}
 
diff --git a/bridge/pkg/solana/client.go b/bridge/pkg/solana/client.go
index 8529ae58a..0fe7ecc87 100644
--- a/bridge/pkg/solana/client.go
+++ b/bridge/pkg/solana/client.go
@@ -1,4 +1,4 @@
-package ethereum
+package solana
 
 import (
 	"bytes"
diff --git a/bridge/pkg/solana/client_test.go b/bridge/pkg/solana/client_test.go
index f34cd0c15..88a3725ff 100644
--- a/bridge/pkg/solana/client_test.go
+++ b/bridge/pkg/solana/client_test.go
@@ -1,4 +1,4 @@
-package ethereum
+package solana
 
 import (
 	"encoding/hex"
diff --git a/bridge/pkg/solana/submitter.go b/bridge/pkg/solana/submitter.go
index 2fcc09c6f..81bf28c50 100644
--- a/bridge/pkg/solana/submitter.go
+++ b/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 {