refactor(Int): importing from "cosmossdk.io/math"

AssetMantle · Oct 9, 2024 · c67f568 · c67f568
1 parent 17a1ff9
commit c67f568
Show file tree

Hide file tree

Showing 33 changed files with 96 additions and 97 deletions.
diff --git a/data/base/acc_address_data.go b/data/base/acc_address_data.go
@@ -5,6 +5,7 @@ package base
 
 import (
 	"bytes"
+	"cosmossdk.io/math"
 	"strings"
 
 	sdkTypes "github.com/cosmos/cosmos-sdk/types"
@@ -27,7 +28,7 @@ func (accAddressData *AccAddressData) ValidateBasic() error {
 func (accAddressData *AccAddressData) GetID() ids.DataID {
 	return baseIDs.GenerateDataID(accAddressData)
 }
-func (accAddressData *AccAddressData) GetBondWeight() sdkTypes.Int {
+func (accAddressData *AccAddressData) GetBondWeight() math.Int {
 	return dataConstants.AccAddressDataWeight
 }
 func (accAddressData *AccAddressData) Compare(listableData data.ListableData) int {

diff --git a/data/base/any_data.go b/data/base/any_data.go
@@ -1,12 +1,12 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"fmt"
 	"github.com/AssetMantle/schema/data"
 	dataConstants "github.com/AssetMantle/schema/data/constants"
 	"github.com/AssetMantle/schema/ids"
 	baseIDs "github.com/AssetMantle/schema/ids/base"
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 	"strings"
 )
 
@@ -130,7 +130,7 @@ func (x *AnyData) GenerateHashID() ids.HashID {
 func (x *AnyData) ToAnyData() data.AnyData {
 	return x
 }
-func (x *AnyData) GetBondWeight() sdkTypes.Int {
+func (x *AnyData) GetBondWeight() math.Int {
 	return x.Impl.(dataGetter).get().GetBondWeight()
 }
 

diff --git a/data/base/any_listable_data.go b/data/base/any_listable_data.go
@@ -1,9 +1,9 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"github.com/AssetMantle/schema/data"
 	"github.com/AssetMantle/schema/ids"
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 )
 
 type listableDataGetter interface {
@@ -45,7 +45,7 @@ func (anyListableData *AnyListableData) Get() data.Data {
 func (anyListableData *AnyListableData) GetID() ids.DataID {
 	return anyListableData.Impl.(listableDataGetter).get().GetID()
 }
-func (anyListableData *AnyListableData) GetBondWeight() sdkTypes.Int {
+func (anyListableData *AnyListableData) GetBondWeight() math.Int {
 	return anyListableData.Impl.(listableDataGetter).get().GetBondWeight()
 }
 func (anyListableData *AnyListableData) ValidateBasic() error {

diff --git a/data/base/boolean_data.go b/data/base/boolean_data.go
@@ -4,11 +4,10 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"strconv"
 	"strings"
 
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
-
 	"github.com/AssetMantle/schema/data"
 	dataConstants "github.com/AssetMantle/schema/data/constants"
 	"github.com/AssetMantle/schema/ids"
@@ -23,7 +22,7 @@ func (booleanData *BooleanData) ValidateBasic() error {
 func (booleanData *BooleanData) GetID() ids.DataID {
 	return baseIDs.GenerateDataID(booleanData)
 }
-func (booleanData *BooleanData) GetBondWeight() sdkTypes.Int {
+func (booleanData *BooleanData) GetBondWeight() math.Int {
 	return dataConstants.BooleanDataWeight
 }
 func (booleanData *BooleanData) Compare(listableData data.ListableData) int {

diff --git a/data/base/dec_data.go b/data/base/dec_data.go
@@ -4,6 +4,7 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"fmt"
 	"github.com/AssetMantle/schema/data"
 	dataConstants "github.com/AssetMantle/schema/data/constants"
@@ -27,7 +28,7 @@ func (decData *DecData) ValidateBasic() error {
 func (decData *DecData) GetID() ids.DataID {
 	return baseIDs.GenerateDataID(decData)
 }
-func (decData *DecData) GetBondWeight() sdkTypes.Int {
+func (decData *DecData) GetBondWeight() math.Int {
 	return dataConstants.DecDataWeight
 }
 func (decData *DecData) Compare(listableData data.ListableData) int {

diff --git a/data/base/height_data.go b/data/base/height_data.go
@@ -4,12 +4,11 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"encoding/binary"
 	"strconv"
 	"strings"
 
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
-
 	"github.com/AssetMantle/schema/data"
 	dataConstants "github.com/AssetMantle/schema/data/constants"
 	"github.com/AssetMantle/schema/ids"
@@ -26,7 +25,7 @@ func (heightData *HeightData) ValidateBasic() error {
 func (heightData *HeightData) GetID() ids.DataID {
 	return baseIDs.GenerateDataID(heightData)
 }
-func (heightData *HeightData) GetBondWeight() sdkTypes.Int {
+func (heightData *HeightData) GetBondWeight() math.Int {
 	return dataConstants.HeightDataWeight
 }
 func (heightData *HeightData) AsString() string {

diff --git a/data/base/id_data.go b/data/base/id_data.go
@@ -4,10 +4,9 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"strings"
 
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
-
 	"github.com/AssetMantle/schema/data"
 	dataConstants "github.com/AssetMantle/schema/data/constants"
 	"github.com/AssetMantle/schema/ids"
@@ -22,7 +21,7 @@ func (idData *IDData) ValidateBasic() error {
 func (idData *IDData) GetID() ids.DataID {
 	return baseIDs.GenerateDataID(idData)
 }
-func (idData *IDData) GetBondWeight() sdkTypes.Int {
+func (idData *IDData) GetBondWeight() math.Int {
 	return dataConstants.IDDataWeight
 }
 func (idData *IDData) AsString() string {

diff --git a/data/base/linked_data.go b/data/base/linked_data.go
@@ -2,13 +2,13 @@ package base
 
 import (
 	"bytes"
+	"cosmossdk.io/math"
 	"fmt"
 	"github.com/AssetMantle/schema/data"
 	dataConstants "github.com/AssetMantle/schema/data/constants"
 	"github.com/AssetMantle/schema/data/utilities"
 	"github.com/AssetMantle/schema/ids"
 	baseIDs "github.com/AssetMantle/schema/ids/base"
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 	"net/url"
 	"strings"
 )
@@ -52,7 +52,7 @@ func (linkedData *LinkedData) Compare(listableData data.ListableData) int {
 func (linkedData *LinkedData) GetID() ids.DataID {
 	return baseIDs.GenerateDataID(linkedData)
 }
-func (linkedData *LinkedData) GetBondWeight() sdkTypes.Int {
+func (linkedData *LinkedData) GetBondWeight() math.Int {
 	return dataConstants.LinkedDataWeight
 }
 func (linkedData *LinkedData) AsString() string {

diff --git a/data/base/list_data.go b/data/base/list_data.go
@@ -5,13 +5,13 @@ package base
 
 import (
 	"bytes"
+	"cosmossdk.io/math"
 	"fmt"
 	"github.com/AssetMantle/schema/data"
 	dataConstants "github.com/AssetMantle/schema/data/constants"
 	"github.com/AssetMantle/schema/data/utilities"
 	"github.com/AssetMantle/schema/ids"
 	baseIDs "github.com/AssetMantle/schema/ids/base"
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 	"sort"
 	"strings"
 )
@@ -51,7 +51,7 @@ func (listData *ListData) Get() []data.AnyListableData {
 
 	return anyListableData
 }
-func (listData *ListData) GetBondWeight() sdkTypes.Int {
+func (listData *ListData) GetBondWeight() math.Int {
 	return dataConstants.ListDataWeight
 }
 func (listData *ListData) AsString() string {

diff --git a/data/base/number_data.go b/data/base/number_data.go
@@ -1,6 +1,7 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"fmt"
 	"github.com/AssetMantle/schema/data"
 	dataConstants "github.com/AssetMantle/schema/data/constants"
@@ -22,7 +23,7 @@ func (numberData *NumberData) ValidateBasic() error {
 func (numberData *NumberData) GetID() ids.DataID {
 	return baseIDs.GenerateDataID(numberData)
 }
-func (numberData *NumberData) GetBondWeight() sdkTypes.Int {
+func (numberData *NumberData) GetBondWeight() math.Int {
 	return dataConstants.NumberDataWeight
 }
 func (numberData *NumberData) AsString() string {
@@ -84,7 +85,7 @@ func (numberData *NumberData) Compare(listableData data.ListableData) int {
 	}
 	return -1
 }
-func (numberData *NumberData) Get() sdkTypes.Int {
+func (numberData *NumberData) Get() math.Int {
 	if value, ok := sdkTypes.NewIntFromString(numberData.Value); !ok {
 		panic("invalid number data")
 	} else {
@@ -96,7 +97,7 @@ func PrototypeNumberData() data.NumberData {
 	return NewNumberData(sdkTypes.ZeroInt()).ZeroValue().(*NumberData)
 }
 
-func NewNumberData(value sdkTypes.Int) data.NumberData {
+func NewNumberData(value math.Int) data.NumberData {
 	return &NumberData{
 		Value: value.String(),
 	}

diff --git a/data/base/number_data_test.go b/data/base/number_data_test.go
@@ -17,7 +17,7 @@ import (
 func Test_NewNumberData(t *testing.T) {
 	tests := []struct {
 		name string
-		args sdkTypes.Int
+		args math.Int
 		want data.Data
 	}{
 		{"+ve", sdkTypes.NewInt(10), &NumberData{"10"}},
@@ -97,7 +97,7 @@ func Test_NumberDataGet(t *testing.T) {
 	tests := []struct {
 		name string
 		args data.NumberData
-		want sdkTypes.Int
+		want math.Int
 	}{
 		{"+ve", NewNumberData(sdkTypes.NewInt(10)), sdkTypes.NewInt(10)},
 	}

diff --git a/data/base/string_data.go b/data/base/string_data.go
@@ -4,12 +4,12 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"fmt"
 	"github.com/AssetMantle/schema/data"
 	dataConstants "github.com/AssetMantle/schema/data/constants"
 	"github.com/AssetMantle/schema/ids"
 	baseIDs "github.com/AssetMantle/schema/ids/base"
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 	"strings"
 )
 
@@ -29,7 +29,7 @@ func (stringData *StringData) ValidateBasic() error {
 func (stringData *StringData) GetID() ids.DataID {
 	return baseIDs.GenerateDataID(stringData)
 }
-func (stringData *StringData) GetBondWeight() sdkTypes.Int {
+func (stringData *StringData) GetBondWeight() math.Int {
 	return dataConstants.StringDataWeight
 }
 func (stringData *StringData) Compare(listableData data.ListableData) int {

diff --git a/data/data.go b/data/data.go
@@ -4,14 +4,14 @@
 package data
 
 import (
+	"cosmossdk.io/math"
 	"github.com/AssetMantle/schema/ids"
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 )
 
 // TODO URI and PropertyID Data type
 type Data interface {
 	GetID() ids.DataID
-	GetBondWeight() sdkTypes.Int
+	GetBondWeight() math.Int
 
 	ValidateBasic() error
 	Unmarshal([]byte) error

diff --git a/data/number_data.go b/data/number_data.go
@@ -1,8 +1,8 @@
 package data
 
-import sdkTypes "github.com/cosmos/cosmos-sdk/types"
+import "cosmossdk.io/math"
 
 type NumberData interface {
 	ListableData
-	Get() sdkTypes.Int
+	Get() math.Int
 }
diff --git a/documents/asset.go b/documents/asset.go
@@ -4,14 +4,14 @@
 package documents
 
 import (
+	"cosmossdk.io/math"
 	"github.com/AssetMantle/schema/types"
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 )
 
 type Asset interface {
 	ValidateAsset() error
 	GetBurnHeight() types.Height
 	GetLockHeight() types.Height
-	GetSupply() sdkTypes.Int
+	GetSupply() math.Int
 	Document
 }
diff --git a/documents/base/asset.go b/documents/base/asset.go
@@ -1,6 +1,7 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"fmt"
 	"github.com/AssetMantle/schema/data"
 	"github.com/AssetMantle/schema/documents"
@@ -9,7 +10,6 @@ import (
 	"github.com/AssetMantle/schema/properties/constants"
 	"github.com/AssetMantle/schema/qualified"
 	"github.com/AssetMantle/schema/types"
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 )
 
 type asset struct {
@@ -51,7 +51,7 @@ func (asset asset) GetLockHeight() types.Height {
 
 	return constants.LockHeightProperty.GetData().Get().(data.HeightData).Get()
 }
-func (asset asset) GetSupply() sdkTypes.Int {
+func (asset asset) GetSupply() math.Int {
 	if property := asset.GetProperty(constants.SupplyProperty.GetID()); property != nil && property.IsMeta() {
 		return property.Get().(properties.MetaProperty).GetData().Get().(data.NumberData).Get()
 	}

diff --git a/documents/base/asset_test.go b/documents/base/asset_test.go
@@ -103,7 +103,7 @@ func Test_asset_GetSupply(t *testing.T) {
 	tests := []struct {
 		name   string
 		fields fields
-		want   sdkTypes.Int
+		want   math.Int
 	}{
 		{"+ve", fields{testDocument}, sdkTypes.OneInt()},
 		{"+ve with supply", fields{testDocumentWithSupply}, sdkTypes.NewInt(77)},

diff --git a/documents/base/classification.go b/documents/base/classification.go
@@ -1,14 +1,14 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"fmt"
 	"github.com/AssetMantle/schema/data"
 	"github.com/AssetMantle/schema/documents"
 	baseIDs "github.com/AssetMantle/schema/ids/base"
 	"github.com/AssetMantle/schema/properties"
 	constantProperties "github.com/AssetMantle/schema/properties/constants"
 	"github.com/AssetMantle/schema/qualified"
-	sdkTypes "github.com/cosmos/cosmos-sdk/types"
 )
 
 type classification struct {
@@ -28,7 +28,7 @@ func (classification classification) ValidateBasic() error {
 
 	return nil
 }
-func (classification classification) GetBondAmount() sdkTypes.Int {
+func (classification classification) GetBondAmount() math.Int {
 	if property := classification.Document.GetProperty(constantProperties.BondAmountProperty.GetID()); property != nil && property.IsMeta() {
 		return property.Get().(properties.MetaProperty).GetData().Get().(data.NumberData).Get()
 	}

diff --git a/documents/base/classification_test.go b/documents/base/classification_test.go
@@ -59,7 +59,7 @@ func Test_classifiaction_GetSupply(t *testing.T) {
 	tests := []struct {
 		name   string
 		fields fields
-		want   sdkTypes.Int
+		want   math.Int
 	}{
 		{"+ve", fields{testDocument}, sdkTypes.ZeroInt()},
 		{"+ve with bondAmount", fields{testDocumentWithSupply}, sdkTypes.NewInt(999)},

diff --git a/documents/base/identity.go b/documents/base/identity.go
@@ -1,6 +1,7 @@
 package base
 
 import (
+	"cosmossdk.io/math"
 	"fmt"
 	"github.com/AssetMantle/schema/data"
 	baseData "github.com/AssetMantle/schema/data/base"
@@ -49,7 +50,7 @@ func (identity identity) IsProvisioned(accAddress sdkTypes.AccAddress) bool {
 	_, isProvisioned := identity.GetAuthentication().Search(baseData.NewAccAddressData(accAddress))
 	return isProvisioned
 }
-func (identity identity) GetProvisionedAddressCount() sdkTypes.Int {
+func (identity identity) GetProvisionedAddressCount() math.Int {
 	return sdkTypes.NewInt(int64(len(identity.GetAuthentication().Get())))
 }
 func (identity identity) ProvisionAddress(accAddresses ...sdkTypes.AccAddress) documents.Identity {