(fix) Addressed comments in PR review

InjectiveLabs · Jan 16, 2024 · 091877c · 091877c
1 parent 76b3f74
commit 091877c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/client/common/util.go b/client/common/util.go
@@ -5,6 +5,7 @@ import (
 	"crypto/x509"
 	"encoding/hex"
 	"fmt"
+	"github.com/shopspring/decimal"
 	"os"
 	"strings"
 
@@ -56,3 +57,7 @@ func MsgResponse(data []byte) []*chaintypes.TxResponseGenericMessage {
 	}
 	return response.Messages
 }
+
+func RemoveExtraDecimals(value decimal.Decimal, decimalsToRemove int32) decimal.Decimal {
+	return value.Div(decimal.New(1, decimalsToRemove))
+}
diff --git a/client/core/market.go b/client/core/market.go
@@ -1,6 +1,7 @@
 package core
 
 import (
+	"github.com/InjectiveLabs/sdk-go/client/common"
 	cosmtypes "github.com/cosmos/cosmos-sdk/types"
 	"github.com/shopspring/decimal"
 )
@@ -47,15 +48,11 @@ func (spotMarket SpotMarket) PriceFromChainFormat(chainValue cosmtypes.Dec) deci
 }
 
 func (spotMarket SpotMarket) QuantityFromExtendedChainFormat(chainValue cosmtypes.Dec) decimal.Decimal {
-	return spotMarket.fromExtendedChainformat(spotMarket.QuantityFromChainFormat(chainValue))
+	return common.RemoveExtraDecimals(spotMarket.QuantityFromChainFormat(chainValue), AdditionalChainFormatDecimals)
 }
 
 func (spotMarket SpotMarket) PriceFromExtendedChainFormat(chainValue cosmtypes.Dec) decimal.Decimal {
-	return spotMarket.fromExtendedChainformat(spotMarket.PriceFromChainFormat(chainValue))
-}
-
-func (spotMarket SpotMarket) fromExtendedChainformat(chainValue decimal.Decimal) decimal.Decimal {
-	return chainValue.Div(decimal.New(1, AdditionalChainFormatDecimals))
+	return common.RemoveExtraDecimals(spotMarket.PriceFromChainFormat(chainValue), AdditionalChainFormatDecimals)
 }
 
 type DerivativeMarket struct {
@@ -130,17 +127,13 @@ func (derivativeMarket DerivativeMarket) MarginFromChainFormat(chainValue cosmty
 }
 
 func (derivativeMarket DerivativeMarket) QuantityFromExtendedChainFormat(chainValue cosmtypes.Dec) decimal.Decimal {
-	return derivativeMarket.fromExtendedChainformat(derivativeMarket.QuantityFromChainFormat(chainValue))
+	return common.RemoveExtraDecimals(derivativeMarket.QuantityFromChainFormat(chainValue), AdditionalChainFormatDecimals)
 }
 
 func (derivativeMarket DerivativeMarket) PriceFromExtendedChainFormat(chainValue cosmtypes.Dec) decimal.Decimal {
-	return derivativeMarket.fromExtendedChainformat(derivativeMarket.PriceFromChainFormat(chainValue))
+	return common.RemoveExtraDecimals(derivativeMarket.PriceFromChainFormat(chainValue), AdditionalChainFormatDecimals)
 }
 
 func (derivativeMarket DerivativeMarket) MarginFromExtendedChainFormat(chainValue cosmtypes.Dec) decimal.Decimal {
-	return derivativeMarket.fromExtendedChainformat(derivativeMarket.MarginFromChainFormat(chainValue))
-}
-
-func (derivativeMarket DerivativeMarket) fromExtendedChainformat(chainValue decimal.Decimal) decimal.Decimal {
-	return chainValue.Div(decimal.New(1, AdditionalChainFormatDecimals))
+	return common.RemoveExtraDecimals(derivativeMarket.MarginFromChainFormat(chainValue), AdditionalChainFormatDecimals)
 }