diff --git a/x/deposit/keeper/deposit.go b/x/deposit/keeper/deposit.go index c6cdc9b2..46b1b4f8 100644 --- a/x/deposit/keeper/deposit.go +++ b/x/deposit/keeper/deposit.go @@ -9,8 +9,13 @@ import ( // SetDeposit stores a deposit in the module's KVStore. func (k *Keeper) SetDeposit(ctx sdk.Context, deposit v1.Deposit) { + addr, err := sdk.AccAddressFromBech32(deposit.Address) + if err != nil { + panic(err) + } + store := k.Store(ctx) - key := types.DepositKey(deposit.GetAddress()) + key := types.DepositKey(addr) value := k.cdc.MustMarshal(&deposit) store.Set(key, value) diff --git a/x/deposit/types/v1/deposit.go b/x/deposit/types/v1/deposit.go index 40fdb693..6bb3e767 100644 --- a/x/deposit/types/v1/deposit.go +++ b/x/deposit/types/v1/deposit.go @@ -7,19 +7,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -func (m *Deposit) GetAddress() sdk.AccAddress { - if m.Address == "" { - return nil - } - - addr, err := sdk.AccAddressFromBech32(m.Address) - if err != nil { - panic(err) - } - - return addr -} - func (m *Deposit) Validate() error { if m.Address == "" { return fmt.Errorf("address cannot be empty") diff --git a/x/deposit/types/v1/deposit_test.go b/x/deposit/types/v1/deposit_test.go index b2c51bd8..fe9003cb 100644 --- a/x/deposit/types/v1/deposit_test.go +++ b/x/deposit/types/v1/deposit_test.go @@ -1,7 +1,6 @@ package v1 import ( - "reflect" "testing" sdk "github.com/cosmos/cosmos-sdk/types" @@ -9,42 +8,6 @@ import ( base "github.com/sentinel-official/hub/v12/types" ) -func TestDeposit_GetAddress(t *testing.T) { - type fields struct { - Address string - } - tests := []struct { - name string - fields fields - want sdk.AccAddress - }{ - { - "empty", - fields{ - Address: base.TestAddrEmpty, - }, - nil, - }, - { - "20 bytes", - fields{ - Address: base.TestBech32AccAddr20Bytes, - }, - sdk.AccAddress{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20}, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - d := &Deposit{ - Address: tt.fields.Address, - } - if got := d.GetAddress(); !reflect.DeepEqual(got, tt.want) { - t.Errorf("GetAddress() = %v, want %v", got, tt.want) - } - }) - } -} - func TestDeposit_Validate(t *testing.T) { type fields struct { Address string diff --git a/x/node/keeper/node.go b/x/node/keeper/node.go index 9edc49a1..f22b18d6 100644 --- a/x/node/keeper/node.go +++ b/x/node/keeper/node.go @@ -15,8 +15,13 @@ import ( // SetActiveNode stores an active node in the module's KVStore. func (k *Keeper) SetActiveNode(ctx sdk.Context, node v3.Node) { + addr, err := base.NodeAddressFromBech32(node.Address) + if err != nil { + panic(err) + } + store := k.Store(ctx) - key := types.ActiveNodeKey(node.GetAddress()) + key := types.ActiveNodeKey(addr) value := k.cdc.MustMarshal(&node) store.Set(key, value) @@ -55,8 +60,13 @@ func (k *Keeper) DeleteActiveNode(ctx sdk.Context, addr base.NodeAddress) { // SetInactiveNode stores an inactive node in the module's KVStore. func (k *Keeper) SetInactiveNode(ctx sdk.Context, node v3.Node) { + addr, err := base.NodeAddressFromBech32(node.Address) + if err != nil { + panic(err) + } + store := k.Store(ctx) - key := types.InactiveNodeKey(node.GetAddress()) + key := types.InactiveNodeKey(addr) value := k.cdc.MustMarshal(&node) store.Set(key, value) diff --git a/x/node/types/v2/node.go b/x/node/types/v2/node.go index 61ba74df..c674612e 100644 --- a/x/node/types/v2/node.go +++ b/x/node/types/v2/node.go @@ -12,19 +12,6 @@ import ( v1base "github.com/sentinel-official/hub/v12/types/v1" ) -func (m *Node) GetAddress() base.NodeAddress { - if m.Address == "" { - return nil - } - - addr, err := base.NodeAddressFromBech32(m.Address) - if err != nil { - panic(err) - } - - return addr -} - func (m *Node) Validate() error { if m.Address == "" { return fmt.Errorf("address cannot be empty") diff --git a/x/node/types/v2/node_test.go b/x/node/types/v2/node_test.go index 76fcc5da..cfab3537 100644 --- a/x/node/types/v2/node_test.go +++ b/x/node/types/v2/node_test.go @@ -12,42 +12,6 @@ import ( v1base "github.com/sentinel-official/hub/v12/types/v1" ) -func TestNode_GetAddress(t *testing.T) { - type fields struct { - Address string - } - tests := []struct { - name string - fields fields - want base.NodeAddress - }{ - { - "address empty", - fields{ - Address: base.TestAddrEmpty, - }, - nil, - }, - { - "address 20 bytes", - fields{ - Address: base.TestBech32NodeAddr20Bytes, - }, - base.NodeAddress{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20}, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - m := &Node{ - Address: tt.fields.Address, - } - if got := m.GetAddress(); !reflect.DeepEqual(got, tt.want) { - t.Errorf("GetAddress() = %v, want %v", got, tt.want) - } - }) - } -} - func TestNode_GigabytePrice(t *testing.T) { type fields struct { GigabytePrices sdk.Coins diff --git a/x/node/types/v3/node.go b/x/node/types/v3/node.go index 6364cef4..62696546 100644 --- a/x/node/types/v3/node.go +++ b/x/node/types/v3/node.go @@ -19,19 +19,6 @@ func (m *Node) GetHourlyPrices() v1base.Prices { return m.HourlyPrices } -func (m *Node) GetAddress() base.NodeAddress { - if m.Address == "" { - return nil - } - - addr, err := base.NodeAddressFromBech32(m.Address) - if err != nil { - panic(err) - } - - return addr -} - func (m *Node) Validate() error { if m.Address == "" { return fmt.Errorf("address cannot be empty") diff --git a/x/provider/keeper/provider.go b/x/provider/keeper/provider.go index de88feb5..2c7f9bde 100644 --- a/x/provider/keeper/provider.go +++ b/x/provider/keeper/provider.go @@ -13,8 +13,13 @@ import ( // SetActiveProvider stores an active provider in the module's KVStore. func (k *Keeper) SetActiveProvider(ctx sdk.Context, v v2.Provider) { + addr, err := base.ProvAddressFromBech32(v.Address) + if err != nil { + panic(err) + } + store := k.Store(ctx) - key := types.ActiveProviderKey(v.GetAddress()) + key := types.ActiveProviderKey(addr) value := k.cdc.MustMarshal(&v) store.Set(key, value) @@ -53,8 +58,13 @@ func (k *Keeper) DeleteActiveProvider(ctx sdk.Context, addr base.ProvAddress) { // SetInactiveProvider stores an inactive provider in the module's KVStore. func (k *Keeper) SetInactiveProvider(ctx sdk.Context, v v2.Provider) { + addr, err := base.ProvAddressFromBech32(v.Address) + if err != nil { + panic(err) + } + store := k.Store(ctx) - key := types.InactiveProviderKey(v.GetAddress()) + key := types.InactiveProviderKey(addr) value := k.cdc.MustMarshal(&v) store.Set(key, value) diff --git a/x/provider/types/v2/provider.go b/x/provider/types/v2/provider.go index 2a315906..05181aed 100644 --- a/x/provider/types/v2/provider.go +++ b/x/provider/types/v2/provider.go @@ -10,19 +10,6 @@ import ( v1base "github.com/sentinel-official/hub/v12/types/v1" ) -func (m *Provider) GetAddress() base.ProvAddress { - if m.Address == "" { - return nil - } - - addr, err := base.ProvAddressFromBech32(m.Address) - if err != nil { - panic(err) - } - - return addr -} - func (m *Provider) Validate() error { if m.Address == "" { return fmt.Errorf("address cannot be empty") diff --git a/x/provider/types/v2/provider_test.go b/x/provider/types/v2/provider_test.go index 512e2dcc..628174c2 100644 --- a/x/provider/types/v2/provider_test.go +++ b/x/provider/types/v2/provider_test.go @@ -1,7 +1,6 @@ package v2 import ( - "reflect" "strings" "testing" @@ -9,50 +8,6 @@ import ( v1base "github.com/sentinel-official/hub/v12/types/v1" ) -func TestProvider_GetAddress(t *testing.T) { - type fields struct { - Address string - Name string - Identity string - Website string - Description string - } - tests := []struct { - name string - fields fields - want base.ProvAddress - }{ - { - "empty", - fields{ - Address: base.TestAddrEmpty, - }, - nil, - }, - { - "20 bytes", - fields{ - Address: base.TestBech32ProvAddr20Bytes, - }, - base.ProvAddress{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20}, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - p := &Provider{ - Address: tt.fields.Address, - Name: tt.fields.Name, - Identity: tt.fields.Identity, - Website: tt.fields.Website, - Description: tt.fields.Description, - } - if got := p.GetAddress(); !reflect.DeepEqual(got, tt.want) { - t.Errorf("GetAddress() = %v, want %v", got, tt.want) - } - }) - } -} - func TestProvider_Validate(t *testing.T) { type fields struct { Address string diff --git a/x/session/types/v2/session.go b/x/session/types/v2/session.go index 7b06318f..60e9e40b 100644 --- a/x/session/types/v2/session.go +++ b/x/session/types/v2/session.go @@ -10,32 +10,6 @@ import ( v1base "github.com/sentinel-official/hub/v12/types/v1" ) -func (m *Session) GetAddress() sdk.AccAddress { - if m.Address == "" { - return nil - } - - addr, err := sdk.AccAddressFromBech32(m.Address) - if err != nil { - panic(err) - } - - return addr -} - -func (m *Session) GetNodeAddress() base.NodeAddress { - if m.NodeAddress == "" { - return nil - } - - addr, err := base.NodeAddressFromBech32(m.NodeAddress) - if err != nil { - panic(err) - } - - return addr -} - func (m *Session) Validate() error { if m.ID == 0 { return fmt.Errorf("id cannot be zero") diff --git a/x/subscription/keeper/allocation.go b/x/subscription/keeper/allocation.go index bcc1e6f8..5c9ce5ca 100644 --- a/x/subscription/keeper/allocation.go +++ b/x/subscription/keeper/allocation.go @@ -9,8 +9,13 @@ import ( // SetAllocation sets the allocation for a given ID and address in the KVStore. func (k *Keeper) SetAllocation(ctx sdk.Context, alloc v2.Allocation) { + addr, err := sdk.AccAddressFromBech32(alloc.Address) + if err != nil { + panic(err) + } + store := k.Store(ctx) - key := types.AllocationKey(alloc.ID, alloc.GetAddress()) + key := types.AllocationKey(alloc.ID, addr) value := k.cdc.MustMarshal(&alloc) store.Set(key, value) diff --git a/x/subscription/types/v2/allocation.go b/x/subscription/types/v2/allocation.go index 5b7faf5d..6c08b6c0 100644 --- a/x/subscription/types/v2/allocation.go +++ b/x/subscription/types/v2/allocation.go @@ -7,19 +7,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" ) -func (m *Allocation) GetAddress() sdk.AccAddress { - if m.Address == "" { - return nil - } - - addr, err := sdk.AccAddressFromBech32(m.Address) - if err != nil { - panic(err) - } - - return addr -} - func (m *Allocation) Validate() error { if m.Address == "" { return fmt.Errorf("address cannot be empty") diff --git a/x/subscription/types/v2/allocation_test.go b/x/subscription/types/v2/allocation_test.go index 5aca6099..e3743a56 100644 --- a/x/subscription/types/v2/allocation_test.go +++ b/x/subscription/types/v2/allocation_test.go @@ -1,51 +1,13 @@ package v2 import ( - "reflect" "testing" sdkmath "cosmossdk.io/math" - sdk "github.com/cosmos/cosmos-sdk/types" base "github.com/sentinel-official/hub/v12/types" ) -func TestAllocation_GetAddress(t *testing.T) { - type fields struct { - Address string - } - tests := []struct { - name string - fields fields - want sdk.AccAddress - }{ - { - "empty account address", - fields{ - Address: base.TestAddrEmpty, - }, - nil, - }, - { - "20 bytes account address", - fields{ - Address: base.TestBech32AccAddr20Bytes, - }, - sdk.AccAddress{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20}, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - m := &Allocation{ - Address: tt.fields.Address, - } - if got := m.GetAddress(); !reflect.DeepEqual(got, tt.want) { - t.Errorf("GetAddress() = %v, want %v", got, tt.want) - } - }) - } -} - func TestAllocation_Validate(t *testing.T) { type fields struct { Address string diff --git a/x/subscription/types/v2/payout.go b/x/subscription/types/v2/payout.go index 7d4a335c..653265c8 100644 --- a/x/subscription/types/v2/payout.go +++ b/x/subscription/types/v2/payout.go @@ -2,38 +2,8 @@ package v2 import ( "fmt" - - sdk "github.com/cosmos/cosmos-sdk/types" - - base "github.com/sentinel-official/hub/v12/types" ) -func (p *Payout) GetAddress() sdk.AccAddress { - if p.Address == "" { - return nil - } - - addr, err := sdk.AccAddressFromBech32(p.Address) - if err != nil { - panic(err) - } - - return addr -} - -func (p *Payout) GetNodeAddress() base.NodeAddress { - if p.NodeAddress == "" { - return nil - } - - addr, err := base.NodeAddressFromBech32(p.NodeAddress) - if err != nil { - panic(err) - } - - return addr -} - func (p *Payout) Validate() error { if p.ID == 0 { return fmt.Errorf("id cannot be zero") diff --git a/x/subscription/types/v2/subscription.go b/x/subscription/types/v2/subscription.go index 928723a9..143c5c5a 100644 --- a/x/subscription/types/v2/subscription.go +++ b/x/subscription/types/v2/subscription.go @@ -128,19 +128,6 @@ func (s *NodeSubscription) Validate() error { return nil } -func (s *NodeSubscription) GetNodeAddress() base.NodeAddress { - if s.NodeAddress == "" { - return nil - } - - addr, err := base.NodeAddressFromBech32(s.NodeAddress) - if err != nil { - panic(err) - } - - return addr -} - func (s *PlanSubscription) Type() SubscriptionType { return TypePlan } diff --git a/x/subscription/types/v2/subscription_test.go b/x/subscription/types/v2/subscription_test.go index 8534d491..d662d130 100644 --- a/x/subscription/types/v2/subscription_test.go +++ b/x/subscription/types/v2/subscription_test.go @@ -237,42 +237,6 @@ func TestBaseSubscription_Validate(t *testing.T) { } } -func TestNodeSubscription_GetNodeAddress(t *testing.T) { - type fields struct { - NodeAddress string - } - tests := []struct { - name string - fields fields - want base.NodeAddress - }{ - { - "node_address empty", - fields{ - NodeAddress: base.TestAddrEmpty, - }, - nil, - }, - { - "node_address 20 bytes", - fields{ - NodeAddress: base.TestBech32NodeAddr20Bytes, - }, - base.NodeAddress{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x20}, - }, - } - for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { - s := &NodeSubscription{ - NodeAddress: tt.fields.NodeAddress, - } - if got := s.GetNodeAddress(); !reflect.DeepEqual(got, tt.want) { - t.Errorf("GetNodeAddress() = %v, want %v", got, tt.want) - } - }) - } -} - func TestNodeSubscription_Type(t *testing.T) { v := &NodeSubscription{} require.Equal(t, TypeNode, v.Type())