Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions internal/api/util/client/zs3_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,15 @@ func (c *ZS3Client) BucketOperation(t *test.SystemTest, queryParams, formData ma
func createForm(form map[string]string) (string, io.Reader, error) {
body := new(bytes.Buffer)
mp := multipart.NewWriter(body)
defer mp.Close()
defer mp.Close() //nolint:errcheck
for key, val := range form {
if strings.HasPrefix(val, "@") {
val = val[1:]
file, err := os.Open(val)
if err != nil {
return "", nil, err
}
defer file.Close() //nolint:gocritic
defer file.Close() //nolint:gocritic,errcheck
part, err := mp.CreateFormFile(key, val)
if err != nil {
return "", nil, err
Expand Down
6 changes: 3 additions & 3 deletions internal/cli/util/api_get_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func ApiGetError[T any](url string, params map[string]string) (*T, error) {
return nil, fmt.Errorf("with request %s, %v", url, err)
}

defer res.Body.Close()
defer res.Body.Close() //nolint:errcheck
if res.StatusCode < 200 && res.StatusCode >= 300 {
return nil, fmt.Errorf("failed API request %s, status code: %d: %v", url, res.StatusCode, err)
}
Expand All @@ -62,7 +62,7 @@ func ApiGet[T any](t *test.SystemTest, url string, params map[string]string) *T
res, err := http.Get(url) //nolint:gosec

require.NoError(t, err, "with request", url)
defer res.Body.Close()
defer res.Body.Close() //nolint:errcheck
require.True(t, res.StatusCode >= 200 && res.StatusCode < 300,
"failed API request %s, status code: %d", url, res.StatusCode)
require.NotNil(t, res.Body, "API response must not be nil")
Expand Down Expand Up @@ -107,7 +107,7 @@ func getNext(t *test.SystemTest, url string, from, to, limit, offset int64, para
res, err := http.Get(url) //nolint:gosec

require.NoError(t, err, "retrieving blocks %d to %d", from, to)
defer res.Body.Close()
defer res.Body.Close() //nolint:errcheck
require.True(t, res.StatusCode >= 200 && res.StatusCode < 300,
"failed API request to get blocks %d to %d, status code: %d", from, to, res.StatusCode)
require.NotNil(t, res.Body, "balance API response must not be nil")
Expand Down
10 changes: 5 additions & 5 deletions internal/cli/util/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ func ReadFile(testSetup *testing.T) Configuration {
if err != nil {
testSetup.Fatalf("Error opening hosts.yaml file: %v\n", err)
}
defer file.Close()
defer file.Close() //nolint:errcheck

decoder := yaml.NewDecoder(file)
var hosts map[string]interface{}
Expand All @@ -322,7 +322,7 @@ func ReadFileAllocation() (data, parity, lock, accessKey, secretKey string) {
if err != nil {
log.Fatalf("Error opening allocation.yaml file: %v", err)
}
defer file.Close()
defer file.Close() //nolint:errcheck

decoder := yaml.NewDecoder(file)
var allocationData map[string]interface{}
Expand All @@ -348,7 +348,7 @@ func AppendToFile(filename, data string) error {
if err != nil {
return err
}
defer file.Close()
defer file.Close() //nolint:errcheck

if _, err := file.WriteString(data); err != nil {
return err
Expand Down Expand Up @@ -399,7 +399,7 @@ func GetAllocationID(path string) string {
if err != nil {
log.Printf("Error opening allocation.txt file: %v", err)
}
defer file.Close()
defer file.Close() //nolint:errcheck

scanner := bufio.NewScanner(file)
scanner.Scan()
Expand All @@ -414,7 +414,7 @@ func ReadFileMC(testSetup *testing.T) McConfiguration {
if err != nil {
testSetup.Fatalf("Error opening hosts.yaml file: %v\n", err)
}
defer file.Close()
defer file.Close() //nolint:errcheck

decoder := yaml.NewDecoder(file)
var hosts map[string]interface{}
Expand Down
2 changes: 1 addition & 1 deletion tests/api_tests/get_latest_finalized_magic_block_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func TestGetLatestFinalizedMagicBlock(testSetup *testing.T) {
func getCurrentHash(t *test.SystemTest) (string, error) {
resp, err := http.Get(apiClient.HealthyServiceProviders.Sharders[0] + "/v1/block/get/latest_finalized_magic_block")
require.Nil(t, err)
defer resp.Body.Close()
defer resp.Body.Close() //nolint:errcheck

var res map[string]interface{}
decoder := json.NewDecoder(resp.Body)
Expand Down
6 changes: 3 additions & 3 deletions tests/cli_tests/mc_tests/1_basic_operations_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func TestZs3Server(testSetup *testing.T) {
if err != nil {
t.Fatalf("Error creating file: %v", err)
}
defer file.Close()
defer file.Close() //nolint:errcheck

_, err = file.WriteString("test")
if err != nil {
Expand All @@ -56,7 +56,7 @@ func TestZs3Server(testSetup *testing.T) {

assert.NotContains(t, output, "../mc: <ERROR>")

os.Remove("a.txt")
os.Remove("a.txt") //nolint:errcheck
})

t.RunSequentially("Test for moving file", func(t *test.SystemTest) {
Expand All @@ -66,7 +66,7 @@ func TestZs3Server(testSetup *testing.T) {
if err != nil {
t.Fatalf("Error creating file: %v", err)
}
defer file.Close()
defer file.Close() //nolint:errcheck

_, err = file.WriteString("test")
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions tests/cli_tests/mc_tests/2_bucket_to_bucket_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package cli_tests

//nolint:errcheck // defer statements for cleanup don't need error handling

import (
"fmt"
"os"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package cli_tests

//nolint:errcheck // defer statements for cleanup don't need error handling

import (
"os"
"strings"
Expand Down
2 changes: 2 additions & 0 deletions tests/cli_tests/zboxcli_download_livestream_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package cli_tests

//nolint:errcheck // defer statements for cleanup don't need error handling

import (
"crypto/md5" //nolint:gosec
"encoding/hex"
Expand Down
7 changes: 4 additions & 3 deletions tests/cli_tests/zboxcli_restricted_blobber_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package cli_tests
import (
"encoding/hex"
"encoding/json"
"github.com/0chain/errors"
"io/ioutil"
"net/http"
"os"
Expand All @@ -14,6 +13,8 @@ import (
"testing"
"time"

"github.com/0chain/errors"

"github.com/0chain/common/core/common"
"github.com/0chain/gosdk/core/zcncrypto"

Expand Down Expand Up @@ -361,7 +362,7 @@ func getBlobberAuthTicket(t *test.SystemTest, blobberID, blobberURL, clientID st
if err != nil {
return authTicket, err
}
defer resp.Body.Close()
defer resp.Body.Close() //nolint:errcheck
var responseMap map[string]string
err = json.NewDecoder(resp.Body).Decode(&responseMap)
if err != nil {
Expand All @@ -371,7 +372,7 @@ func getBlobberAuthTicket(t *test.SystemTest, blobberID, blobberURL, clientID st
}
authTicket = responseMap["auth_ticket"]
if authTicket == "" {
common.NewError("500", "Error getting auth ticket from blobber")
_ = common.NewError("500", "Error getting auth ticket from blobber")
}
return authTicket, nil
}
2 changes: 2 additions & 0 deletions tests/cli_tests/zboxcli_share_file_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package cli_tests

//nolint:errcheck // defer statements for cleanup don't need error handling

import (
"encoding/hex"
"fmt"
Expand Down
2 changes: 2 additions & 0 deletions tests/cli_tests/zboxcli_sync_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package cli_tests

//nolint:errcheck // defer statements for cleanup don't need error handling

import (
"encoding/json"
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion tests/tokenomics_tests/utils/blobbers.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ func getBlobberAuthTicket(t *test.SystemTest, cliConfigFileName, blobberID, blob
if err != nil {
return authTicket, err
}
defer resp.Body.Close()
defer resp.Body.Close() //nolint:errcheck
var responseMap map[string]string
err = json.NewDecoder(resp.Body).Decode(&responseMap)
if err != nil {
Expand Down
Loading