fix lint

crypto-com · Dec 1, 2024 · b776ec2 · b776ec2
1 parent 4d43ac5
commit b776ec2
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 28 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -18,7 +18,7 @@ jobs:
         uses: golangci/golangci-lint-action@v3
         with:
           # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
-          version: v1.62.0
+          version: v1.49
 
           # Optional: working directory, useful for monorepos
           # working-directory: somedir

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 .PHONY: has_docker has_docker_compose lint build_ginkgo_image test test_watch ginkgo
 
-GOLANGCI_LINT_VERSION := "v1.62.0"
+GOLANGCI_LINT_VERSION := "v1.49"
 
 # Use lazy assignment(`=`) such that command existence are evaluated when used
 GO = $(shell command -v go)

diff --git a/external/json/numeric_string.go b/external/json/numeric_string.go
@@ -25,11 +25,11 @@ func NewNumericStringFromBigInt(v *big.Int) *NumericString {
 	return &NumericString{v: v.String()}
 }
 
-func (u *NumericString) String() string {
+func (u NumericString) String() string {
 	return u.v
 }
 
-func (u *NumericString) MarshalJSON() ([]byte, error) {
+func (u NumericString) MarshalJSON() ([]byte, error) {
 	return []byte(fmt.Sprintf("\"%s\"", u.String())), nil
 }
 

diff --git a/external/json/uint16.go b/external/json/uint16.go
@@ -14,15 +14,15 @@ func NewUint16(v uint16) Uint16 {
 	return Uint16{v: v}
 }
 
-func (u *Uint16) Uint16() uint16 {
+func (u Uint16) Uint16() uint16 {
 	return u.v
 }
 
-func (u *Uint16) String() string {
+func (u Uint16) String() string {
 	return strconv.Itoa(int(u.v))
 }
 
-func (u *Uint16) MarshalJSON() ([]byte, error) {
+func (u Uint16) MarshalJSON() ([]byte, error) {
 	// uint16 number can be handled by all languages as number
 	return []byte(u.String()), nil
 }

diff --git a/external/json/uint16_test.go b/external/json/uint16_test.go
@@ -35,8 +35,7 @@ var _ = Describe("Uint16", func() {
 
 		It("should encode to the number representation", func() {
 			v := json.NewUint16(65535)
-
-			actual, err := v.MarshalJSON()
+			actual, err := jsoniter.Marshal(v)
 
 			Expect(err).To(BeNil())
 			Expect(actual).To(Equal([]byte("65535")))
@@ -84,10 +83,10 @@ var _ = Describe("Uint16", func() {
 
 		It("should be able to encode and decode to/from json", func() {
 			expected := json.NewUint16(65535)
-			encoded, _ := expected.MarshalJSON()
+			encoded, _ := jsoniter.Marshal(expected)
 
 			var actual json.Uint16
-			err := actual.UnmarshalJSON(encoded)
+			err := jsoniter.Unmarshal(encoded, &actual)
 
 			Expect(err).To(BeNil())
 			Expect(actual.String()).To(Equal(expected.String()))

diff --git a/external/json/uint32.go b/external/json/uint32.go
@@ -14,15 +14,15 @@ func NewUint32(v uint32) Uint32 {
 	return Uint32{v: v}
 }
 
-func (u *Uint32) Uint32() uint32 {
+func (u Uint32) Uint32() uint32 {
 	return u.v
 }
 
-func (u *Uint32) String() string {
+func (u Uint32) String() string {
 	return strconv.Itoa(int(u.v))
 }
 
-func (u *Uint32) MarshalJSON() ([]byte, error) {
+func (u Uint32) MarshalJSON() ([]byte, error) {
 	return []byte(u.String()), nil
 }
 

diff --git a/external/json/uint32_test.go b/external/json/uint32_test.go
@@ -35,7 +35,7 @@ var _ = Describe("Uint32", func() {
 
 		It("should encode to the number representation", func() {
 			v := json.NewUint32(65535)
-			actual, err := v.MarshalJSON()
+			actual, err := jsoniter.Marshal(v)
 
 			Expect(err).To(BeNil())
 			Expect(actual).To(Equal([]byte("65535")))
@@ -83,10 +83,10 @@ var _ = Describe("Uint32", func() {
 
 		It("should be able to encode and decode to/from json", func() {
 			expected := json.NewUint32(65535)
-			encoded, _ := expected.MarshalJSON()
+			encoded, _ := jsoniter.Marshal(expected)
 
 			var actual json.Uint32
-			err := actual.UnmarshalJSON(encoded)
+			err := jsoniter.Unmarshal(encoded, &actual)
 
 			Expect(err).To(BeNil())
 			Expect(actual.String()).To(Equal(expected.String()))

diff --git a/external/json/uint64.go b/external/json/uint64.go
@@ -24,15 +24,15 @@ func NewUint64FromString(v string) (*Uint64, error) {
 	return &Uint64{v: typedVal}, nil
 }
 
-func (u *Uint64) Uint64() uint64 {
+func (u Uint64) Uint64() uint64 {
 	return u.v
 }
 
-func (u *Uint64) String() string {
+func (u Uint64) String() string {
 	return strconv.FormatUint(u.v, 10)
 }
 
-func (u *Uint64) MarshalJSON() ([]byte, error) {
+func (u Uint64) MarshalJSON() ([]byte, error) {
 	return []byte(fmt.Sprintf("\"%s\"", u.String())), nil
 }
 

diff --git a/external/json/uint64_test.go b/external/json/uint64_test.go
@@ -35,7 +35,7 @@ var _ = Describe("Uint64", func() {
 
 		It("should encode to the string representation", func() {
 			v := json.NewUint64(18446744073709551615)
-			actual, err := v.MarshalJSON()
+			actual, err := jsoniter.Marshal(v)
 
 			Expect(err).To(BeNil())
 			Expect(actual).To(Equal([]byte("\"18446744073709551615\"")))
@@ -83,10 +83,10 @@ var _ = Describe("Uint64", func() {
 
 		It("should be able to encode and decode to/from json", func() {
 			expected := json.NewUint64(18446744073709551615)
-			encoded, _ := expected.MarshalJSON()
+			encoded, _ := jsoniter.Marshal(expected)
 
 			var actual json.Uint64
-			err := actual.UnmarshalJSON(encoded)
+			err := jsoniter.Unmarshal(encoded, &actual)
 
 			Expect(err).To(BeNil())
 			Expect(actual.String()).To(Equal(expected.String()))

diff --git a/external/utctime/utctime.go b/external/utctime/utctime.go
@@ -128,13 +128,14 @@ func (t UTCTime) MarshalJSON() ([]byte, error) {
 	return result, nil
 }
 
-func UnmarshalJSON(data []byte) (gotime.Time, error) {
+func (t *UTCTime) UnmarshalJSON(data []byte) error {
 	var timeVal gotime.Time
 	if err := jsoniter.Unmarshal(data, &timeVal); err != nil {
-		return gotime.Time{}, err
+		return err
 	}
+	t.unixNano = timeVal.UTC().UnixNano()
 
-	return timeVal.UTC(), nil
+	return nil
 }
 
 // A Month specifies a month of the year (January = 1, ...).

diff --git a/external/utctime/utctime_test.go b/external/utctime/utctime_test.go
@@ -32,7 +32,8 @@ var _ = Describe("UTCTime", func() {
 			var err error
 			t, _ := jsoniter.Marshal(time.Unix(0, 1000000).UTC())
 
-			actual, err := utctime.UnmarshalJSON(t)
+			var actual utctime.UTCTime
+			err = jsoniter.Unmarshal(t, &actual)
 			Expect(err).To(BeNil())
 			Expect(actual.UnixNano()).To(Equal(int64(1000000)))
 		})
@@ -41,7 +42,8 @@ var _ = Describe("UTCTime", func() {
 			expected := utctime.FromUnixNano(1000000)
 			encoded, _ := jsoniter.Marshal(expected)
 
-			actual, err := utctime.UnmarshalJSON(encoded)
+			var actual utctime.UTCTime
+			err := jsoniter.Unmarshal(encoded, &actual)
 
 			Expect(err).To(BeNil())
 			Expect(actual.UnixNano()).To(Equal(expected.UnixNano()))