Merge pull request #27 from zenon-network/bugfix/rpc-balanceinfo

[rpc] Fix BalanceInfo UnmarshalJSON
zenon-network · Oct 10, 2023 · 6c831da · 6c831da
2 parents 68a8f34 + ddbe074
commit 6c831da
Showing 1 changed file with 6 additions and 27 deletions.
diff --git a/rpc/api/ledger_types.go b/rpc/api/ledger_types.go
@@ -106,26 +106,14 @@ type BalanceInfo struct {
 }
 
 type BalanceInfoMarshal struct {
-	TokenMarshal `json:"token"`
-	Balance      string `json:"balance"`
+	TokenInfo *TokenMarshal `json:"token"`
+	Balance   string        `json:"balance"`
 }
 
 func (b *BalanceInfo) ToBalanceInfoMarshal() BalanceInfoMarshal {
 	aux := BalanceInfoMarshal{
-		TokenMarshal: TokenMarshal{
-			TokenName:          b.TokenInfo.TokenName,
-			TokenSymbol:        b.TokenInfo.TokenSymbol,
-			TokenDomain:        b.TokenInfo.TokenDomain,
-			MaxSupply:          b.TokenInfo.MaxSupply.String(),
-			Decimals:           b.TokenInfo.Decimals,
-			Owner:              b.TokenInfo.Owner,
-			ZenonTokenStandard: b.TokenInfo.ZenonTokenStandard,
-			TotalSupply:        b.TokenInfo.TotalSupply.String(),
-			IsBurnable:         b.TokenInfo.IsBurnable,
-			IsMintable:         b.TokenInfo.IsMintable,
-			IsUtility:          b.TokenInfo.IsUtility,
-		},
-		Balance: b.Balance.String(),
+		TokenInfo: b.TokenInfo.ToTokenMarshal(),
+		Balance:   b.Balance.String(),
 	}
 	return aux
 }
@@ -138,17 +126,8 @@ func (b *BalanceInfo) UnmarshalJSON(data []byte) error {
 		return err
 	}
 
-	b.TokenInfo.TokenName = aux.TokenName
-	b.TokenInfo.TokenSymbol = aux.TokenSymbol
-	b.TokenInfo.TokenDomain = aux.TokenDomain
-	b.TokenInfo.MaxSupply = common.StringToBigInt(aux.MaxSupply)
-	b.TokenInfo.Decimals = aux.Decimals
-	b.TokenInfo.Owner = aux.Owner
-	b.TokenInfo.ZenonTokenStandard = aux.ZenonTokenStandard
-	b.TokenInfo.TotalSupply = common.StringToBigInt(aux.TotalSupply)
-	b.TokenInfo.IsBurnable = aux.IsBurnable
-	b.TokenInfo.IsMintable = aux.IsMintable
-	b.TokenInfo.IsUtility = aux.IsUtility
+	b.TokenInfo = aux.TokenInfo.FromTokenMarshal()
+	b.Balance = common.StringToBigInt(aux.Balance)
 	return nil
 }