add omitempty in new added fields (bnb-chain#792)

* add omitempty in new added fields * fix imports
MikeSworl · Aug 21, 2020 · 9cdbda8 · 9cdbda8
1 parent 0ebef43
commit 9cdbda8
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git a/common/types/mini_token.go b/common/types/mini_token.go
@@ -66,8 +66,8 @@ type MiniToken struct {
 	Mintable         bool            `json:"mintable"`
 	TokenType        SupplyRangeType `json:"token_type"`
 	TokenURI         string          `json:"token_uri"` //TODO set max length
-	ContractAddress  string          `json:"contract_address"`
-	ContractDecimals int8            `json:"contract_decimals"`
+	ContractAddress  string          `json:"contract_address,omitempty"`
+	ContractDecimals int8            `json:"contract_decimals,omitempty"`
 }
 
 var _ IToken = &MiniToken{}

diff --git a/common/types/token.go b/common/types/token.go
@@ -52,8 +52,8 @@ type Token struct {
 	TotalSupply      utils.Fixed8   `json:"total_supply"`
 	Owner            sdk.AccAddress `json:"owner"`
 	Mintable         bool           `json:"mintable"`
-	ContractAddress  string         `json:"contract_address"`
-	ContractDecimals int8           `json:"contract_decimals"`
+	ContractAddress  string         `json:"contract_address,omitempty"`
+	ContractDecimals int8           `json:"contract_decimals,omitempty"`
 }
 
 func (token Token) GetName() string {

diff --git a/common/types/token_test.go b/common/types/token_test.go
@@ -1,11 +1,14 @@
 package types_test
 
 import (
+	"encoding/json"
 	"testing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/stretchr/testify/require"
 
 	"github.com/binance-chain/node/common/types"
+	"github.com/binance-chain/node/common/utils"
 )
 
 var issueMsgSymbolTestCases = []struct {
@@ -106,3 +109,40 @@ func TestValidateTokenSymbol(t *testing.T) {
 		t.Errorf("ValidateIssueSymbol() error = %v, expected XYZ to be invalid", err)
 	}
 }
+
+func TestMarshalToken(t *testing.T) {
+	type beforeToken struct {
+		Name        string         `json:"name"`
+		Symbol      string         `json:"symbol"`
+		OrigSymbol  string         `json:"original_symbol"`
+		TotalSupply utils.Fixed8   `json:"total_supply"`
+		Owner       sdk.AccAddress `json:"owner"`
+		Mintable    bool           `json:"mintable"`
+	}
+
+	type beforeMiniToken struct {
+		Name        string                `json:"name"`
+		Symbol      string                `json:"symbol"`
+		OrigSymbol  string                `json:"original_symbol"`
+		TotalSupply utils.Fixed8          `json:"total_supply"`
+		Owner       sdk.AccAddress        `json:"owner"`
+		Mintable    bool                  `json:"mintable"`
+		TokenType   types.SupplyRangeType `json:"token_type"`
+		TokenURI    string                `json:"token_uri"` //TODO set max length
+	}
+
+	emptyBeforeToken, err := json.Marshal(beforeToken{})
+	require.Nil(t, err, "error should be nil")
+
+	emptyBeforeMiniToken, err := json.Marshal(beforeMiniToken{})
+	require.Nil(t, err, "error should be nil")
+
+	emptyToken, err := json.Marshal(types.Token{})
+	require.Nil(t, err, "error should be nil")
+
+	emptyMiniToken, err := json.Marshal(types.MiniToken{})
+	require.Nil(t, err, "error should be nil")
+
+	require.Equal(t, string(emptyBeforeToken), string(emptyToken))
+	require.Equal(t, string(emptyBeforeMiniToken), string(emptyMiniToken))
+}