Skip to content

linter fixes #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ianthpun merged 2 commits into from
Feb 3, 2024
Merged

linter fixes #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8b07aa
linter fixes
ianthpun Feb 3, 2024
c4fbb9b
fix remaining linter issues
ianthpun Feb 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config/json/dependency_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
44 changes: 22 additions & 22 deletions flowkit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}},
)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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),
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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(),
}},
)

Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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{
Expand Down
1 change: 1 addition & 0 deletions project/deployment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") {
Expand Down