From 43c3c5758f630154665744d60a429a4fa07c22c4 Mon Sep 17 00:00:00 2001
From: aalu1418 <50029043+aalu1418@users.noreply.github.com>
Date: Mon, 20 May 2024 13:00:34 -0600
Subject: [PATCH] fix e2e tests

---
 integration-tests/gauntlet/gauntlet_solana.go | 10 +++++-----
 integration-tests/go.mod                      |  2 +-
 integration-tests/solclient/ocr2.go           |  6 +++---
 pkg/solana/cache_test.go                      |  6 ++----
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/integration-tests/gauntlet/gauntlet_solana.go b/integration-tests/gauntlet/gauntlet_solana.go
index 0c4ffe147..3c74464ac 100644
--- a/integration-tests/gauntlet/gauntlet_solana.go
+++ b/integration-tests/gauntlet/gauntlet_solana.go
@@ -285,7 +285,7 @@ func (sg *SolanaGauntlet) ProposeOnChainConfig(proposalID string, onChainConfig
 
 	_, err = sg.G.ExecCommand([]string{
 		"ocr2:propose_config",
-		fmt.Sprintf("--proposalID=%s", proposalID),
+		fmt.Sprintf("--proposalId=%s", proposalID),
 		fmt.Sprintf("--input=%v", string(config)),
 		ocrFeedAddress,
 	},
@@ -311,7 +311,7 @@ func (sg *SolanaGauntlet) ProposeOffChainConfig(proposalID string, offChainConfi
 
 	_, err = sg.G.ExecCommand([]string{
 		"ocr2:propose_offchain_config",
-		fmt.Sprintf("--proposalID=%s", proposalID),
+		fmt.Sprintf("--proposalId=%s", proposalID),
 		fmt.Sprintf("--input=%v", string(config)),
 		ocrFeedAddress,
 	},
@@ -337,7 +337,7 @@ func (sg *SolanaGauntlet) ProposePayees(proposalID string, payeesConfig common.P
 
 	_, err = sg.G.ExecCommand([]string{
 		"ocr2:propose_payees",
-		fmt.Sprintf("--proposalID=%s", proposalID),
+		fmt.Sprintf("--proposalId=%s", proposalID),
 		fmt.Sprintf("--input=%v", string(config)),
 		ocrFeedAddress,
 	},
@@ -358,7 +358,7 @@ func (sg *SolanaGauntlet) ProposePayees(proposalID string, payeesConfig common.P
 func (sg *SolanaGauntlet) FinalizeProposal(proposalID string) (string, error) {
 	_, err := sg.G.ExecCommand([]string{
 		"ocr2:finalize_proposal",
-		fmt.Sprintf("--proposalID=%s", proposalID),
+		fmt.Sprintf("--proposalId=%s", proposalID),
 	},
 		*sg.options,
 	)
@@ -382,7 +382,7 @@ func (sg *SolanaGauntlet) AcceptProposal(proposalID string, secret string, propo
 
 	_, err = sg.G.ExecCommand([]string{
 		"ocr2:accept_proposal",
-		fmt.Sprintf("--proposalID=%s", proposalID),
+		fmt.Sprintf("--proposalId=%s", proposalID),
 		fmt.Sprintf("--secret=%s", secret),
 		fmt.Sprintf("--input=%s", string(config)),
 		ocrFeedAddres,
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 49e42190d..4657015b2 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -5,7 +5,6 @@ go 1.21.7
 replace github.com/smartcontractkit/chainlink-solana => ../
 
 require (
-	github.com/ethereum/go-ethereum v1.13.8
 	github.com/gagliardetto/binary v0.7.7
 	github.com/gagliardetto/solana-go v1.8.4
 	github.com/google/uuid v1.6.0
@@ -136,6 +135,7 @@ require (
 	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
 	github.com/esote/minmaxheap v1.0.0 // indirect
 	github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
+	github.com/ethereum/go-ethereum v1.13.8 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
 	github.com/evanphx/json-patch/v5 v5.6.0 // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
diff --git a/integration-tests/solclient/ocr2.go b/integration-tests/solclient/ocr2.go
index 557e43e66..1fe3b375d 100644
--- a/integration-tests/solclient/ocr2.go
+++ b/integration-tests/solclient/ocr2.go
@@ -195,9 +195,9 @@ func (m *OCRv2) fetchProposalAccount() (*ocr_2.Proposal, error) {
 		m.Proposal.PublicKey(),
 		&proposal,
 	)
-	if err != nil {
-		return nil, err
-	}
+	// if err != nil {
+	// 	return nil, err
+	// }
 	// reimplement GetAccountDataInto with options
 	resp, err := m.Client.RPC.GetAccountInfoWithOpts(
 		context.Background(),
diff --git a/pkg/solana/cache_test.go b/pkg/solana/cache_test.go
index 3d2529d8d..fb5605a40 100644
--- a/pkg/solana/cache_test.go
+++ b/pkg/solana/cache_test.go
@@ -158,15 +158,13 @@ func TestCache(t *testing.T) {
 		// state query
 		if bytes.Contains(body, []byte("11111111111111111111111111111111")) {
 			// Drop error, client may cancel ctx.
-			_, err = w.Write(testStateResponse())
-			require.NoError(t, err)
+			w.Write(testStateResponse()) //nolint:errcheck
 			return
 		}
 
 		// transmissions query
 		// Drop error, client may cancel ctx.
-		_, err = w.Write(testTransmissionsResponse(t, body, 0))
-		require.NoError(t, err)
+		w.Write(testTransmissionsResponse(t, body, 0)) //nolint:errcheck
 	}))
 
 	lggr := logger.Test(t)