using default value method

vechain · May 2, 2024 · 47d91f5 · 47d91f5
1 parent b3e6bfd
commit 47d91f5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/genesis/customnet.go b/genesis/customnet.go
@@ -254,8 +254,9 @@ func (i *HexOrDecimal256) UnmarshalJSON(input []byte) error {
 }
 
 // MarshalJSON implements the json.Marshaler interface.
-func (i *HexOrDecimal256) MarshalJSON() ([]byte, error) {
-	text, err := (*math.HexOrDecimal256)(i).MarshalText()
+func (i HexOrDecimal256) MarshalJSON() ([]byte, error) {
+	decimal256 := math.HexOrDecimal256(i)
+	text, err := decimal256.MarshalText()
 	if err != nil {
 		return nil, err
 	}

diff --git a/genesis/customnet_test.go b/genesis/customnet_test.go
@@ -162,11 +162,13 @@ func TestHexOrDecimal256MarshalUnmarshal(t *testing.T) {
 	assert.Equal(t, originalHex, string(directMarshallJson))
 
 	// using json overloading ( satisfies the json.Unmarshal interface )
+	// using value
 	marshalVal, err := json.Marshal(unmarshaledValue)
 	assert.NoError(t, err, "Marshaling should not produce an error")
-	assert.NotEqual(t, originalHex, string(marshalVal))
+	assert.Equal(t, originalHex, string(marshalVal))
 
 	// using json overloading ( satisfies the json.Unmarshal interface )
+	// using pointer
 	marshalPtr, err := json.Marshal(&unmarshaledValue)
 	assert.NoError(t, err, "Marshaling should not produce an error")
 	assert.Equal(t, originalHex, string(marshalPtr))

diff --git a/thor/bytes32.go b/thor/bytes32.go
@@ -45,8 +45,8 @@ func (b Bytes32) IsZero() bool {
 }
 
 // MarshalJSON implements json.Marshaler.
-func (b *Bytes32) MarshalJSON() ([]byte, error) {
-	if b == nil {
+func (b Bytes32) MarshalJSON() ([]byte, error) {
+	if b == [32]byte{} {
 		return json.Marshal(nil)
 	}
 

diff --git a/thor/bytes32_test.go b/thor/bytes32_test.go
@@ -29,12 +29,13 @@ func TestMarshalUnmarshall(t *testing.T) {
 	assert.Equal(t, originalHex, string(directMarshallJson))
 
 	// using json overloading ( satisfies the json.Unmarshal interface )
-	// direct value does not marshal correctly
+	// using value
 	marshalVal, err := json.Marshal(unmarshaledValue)
 	assert.NoError(t, err)
-	assert.NotEqual(t, originalHex, string(marshalVal))
+	assert.Equal(t, originalHex, string(marshalVal))
 
 	// using json overloading ( satisfies the json.Unmarshal interface )
+	// using pointer
 	marshalPtr, err := json.Marshal(&unmarshaledValue)
 	assert.NoError(t, err, "Marshaling should not produce an error")
 	assert.Equal(t, originalHex, string(marshalPtr))