From d8b07aa2a84327b183f57918cf7d6a7f686ea3d6 Mon Sep 17 00:00:00 2001
From: Ian Pun <ian.pun@dapperlabs.com>
Date: Fri, 2 Feb 2024 16:30:16 -0800
Subject: [PATCH 1/2] linter fixes

---
 flowkit_test.go | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/flowkit_test.go b/flowkit_test.go
index 3a1fb13f..04353a5a 100644
--- a/flowkit_test.go
+++ b/flowkit_test.go
@@ -145,10 +145,10 @@ func TestAccounts(t *testing.T) {
 			ctx,
 			serviceAcc,
 			[]accounts.PublicKey{{
-				pubKey,
-				flow.AccountKeyWeightThreshold,
-				crypto.ECDSA_P256,
-				crypto.SHA3_256,
+				Public: pubKey,
+				Weight: flow.AccountKeyWeightThreshold,
+				SigAlgo: crypto.ECDSA_P256,
+				HashAlgo: crypto.SHA3_256,
 			}},
 		)
 
@@ -1527,10 +1527,10 @@ func setupAccount(state *State, flowkit Flowkit, account *accounts.Account) {
 		ctx,
 		srv,
 		[]accounts.PublicKey{{
-			(*pk).PublicKey(),
-			flow.AccountKeyWeightThreshold,
-			key.SigAlgo(),
-			key.HashAlgo(),
+			Public: (*pk).PublicKey(),
+			Weight: flow.AccountKeyWeightThreshold,
+			SigAlgo: key.SigAlgo(),
+			HashAlgo: key.HashAlgo(),
 		}},
 	)
 
@@ -1744,9 +1744,9 @@ func TestTransactions_Integration(t *testing.T) {
 		tx, err := flowkit.BuildTransaction(
 			ctx,
 			transactions.AddressesRoles{
-				signer,
-				[]flow.Address{signer},
-				signer,
+				Proposer: signer,
+				Authorizers: []flow.Address{signer},
+				Payer: signer,
 			},
 			srvAcc.Key.Index(),
 			Script{
@@ -1778,9 +1778,9 @@ func TestTransactions_Integration(t *testing.T) {
 		tx, err := flowkit.BuildTransaction(
 			ctx,
 			transactions.AddressesRoles{
-				a.Address,
-				nil,
-				a.Address,
+				Proposer: a.Address,
+				Authorizers: nil,
+				Payer: a.Address,
 			},
 			0,
 			Script{
@@ -1817,9 +1817,9 @@ func TestTransactions_Integration(t *testing.T) {
 		tx, err := flowkit.BuildTransaction(
 			ctx,
 			transactions.AddressesRoles{
-				a.Address,
-				[]flow.Address{a.Address},
-				a.Address,
+				Proposer: a.Address,
+				Authorizers: []flow.Address{a.Address},
+				Payer: a.Address,
 			},
 			0,
 			Script{
@@ -1856,9 +1856,9 @@ func TestTransactions_Integration(t *testing.T) {
 		tx, err := flowkit.BuildTransaction(
 			ctx,
 			transactions.AddressesRoles{
-				a.Address,
-				[]flow.Address{a.Address},
-				a.Address,
+				Proposer: a.Address,
+				Authorizers: []flow.Address{a.Address},
+				Payer: a.Address,
 			},
 			0,
 			Script{

From c4fbb9bcbe64bc3ba5b44d316a6776317d93b22d Mon Sep 17 00:00:00 2001
From: Ian Pun <ian.pun@dapperlabs.com>
Date: Fri, 2 Feb 2024 16:32:31 -0800
Subject: [PATCH 2/2] fix remaining linter issues

---
 config/json/dependency_test.go | 1 +
 flowkit_test.go                | 4 ++--
 project/deployment_test.go     | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/config/json/dependency_test.go b/config/json/dependency_test.go
index 3467b130..99467bbd 100644
--- a/config/json/dependency_test.go
+++ b/config/json/dependency_test.go
@@ -67,6 +67,7 @@ func Test_TransformDependenciesToJSON(t *testing.T) {
 	assert.NoError(t, err)
 
 	contracts, err := jsonContracts.transformToConfig()
+	assert.NoError(t, err)
 	dependencies, err := jsonDependencies.transformToConfig()
 	assert.NoError(t, err)
 
diff --git a/flowkit_test.go b/flowkit_test.go
index 04353a5a..7f134fe3 100644
--- a/flowkit_test.go
+++ b/flowkit_test.go
@@ -262,7 +262,6 @@ func TestAccountsCreate_Integration(t *testing.T) {
 
 	type accountsOut struct {
 		address string
-		code    map[string][]byte
 		balance uint64
 		pubKeys []crypto.PublicKey
 		weights []int
@@ -450,7 +449,7 @@ func TestAccountsAddContract_Integration(t *testing.T) {
 		require.NotNil(t, acc)
 		assert.Equal(t, acc.Contracts["Simple"], tests.ContractSimple.Source)
 
-		ID, _, err = flowkit.AddContract(
+		_, _, err = flowkit.AddContract(
 			ctx,
 			srvAcc,
 			resourceToContract(tests.ContractSimpleUpdated),
@@ -1306,6 +1305,7 @@ func TestProject_Integration(t *testing.T) {
 		assert.Len(t, contracts, 3)
 
 		account, err := flowkit.GetAccount(ctx, srvAcc.Address)
+		assert.NoError(t, err)
 
 		for i, c := range testContracts {
 			code, exists := account.Contracts[c.Name]
diff --git a/project/deployment_test.go b/project/deployment_test.go
index f5916ea7..496e34fb 100644
--- a/project/deployment_test.go
+++ b/project/deployment_test.go
@@ -180,6 +180,7 @@ func TestContractDeploymentOrder(t *testing.T) {
 			}
 
 			deployment, err := NewDeployment(contracts, nil)
+			assert.NoError(t, err)
 
 			contracts, err = deployment.Sort()
 			if !strings.Contains(testCase.name, "unresolved") && !strings.Contains(testCase.name, "cycle") {