Skip to content

Commit

Permalink
bez feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
@stackman27
stackman27 committed Oct 31, 2022
1 parent d297bf8 commit bdff9b3
Show file tree
Hide file tree
Showing 33 changed files with 189 additions and 191 deletions.
4 changes: 2 additions & 2 deletions app/keepers/keepers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ import (
"github.com/osmosis-labs/osmosis/v12/x/txfees"
txfeeskeeper "github.com/osmosis-labs/osmosis/v12/x/txfees/keeper"
txfeestypes "github.com/osmosis-labs/osmosis/v12/x/txfees/types"
validatorpreference "github.com/osmosis-labs/osmosis/v12/x/validator-preference"
validatorpreferencetypes "github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
validatorpreference "github.com/osmosis-labs/osmosis/v12/x/valset-pref"
validatorpreferencetypes "github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"
)

type AppKeepers struct {
Expand Down
2 changes: 1 addition & 1 deletion app/keepers/modules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import (
"github.com/osmosis-labs/osmosis/v12/x/tokenfactory"
"github.com/osmosis-labs/osmosis/v12/x/twap/twapmodule"
"github.com/osmosis-labs/osmosis/v12/x/txfees"
validatorpreferencemodule "github.com/osmosis-labs/osmosis/v12/x/validator-preference/valpref-module"
validatorpreferencemodule "github.com/osmosis-labs/osmosis/v12/x/valset-pref/valpref-module"
)

// AppModuleBasics returns ModuleBasics for the module BasicManager.
Expand Down
4 changes: 2 additions & 2 deletions app/modules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ import (
twaptypes "github.com/osmosis-labs/osmosis/v12/x/twap/types"
"github.com/osmosis-labs/osmosis/v12/x/txfees"
txfeestypes "github.com/osmosis-labs/osmosis/v12/x/txfees/types"
validatorpreferencetypes "github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
validatorpreferencemodule "github.com/osmosis-labs/osmosis/v12/x/validator-preference/valpref-module"
validatorpreferencetypes "github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"
validatorpreferencemodule "github.com/osmosis-labs/osmosis/v12/x/valset-pref/valpref-module"
)

// moduleAccountPermissions defines module account permissions
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v13/constants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package v13
import (
store "github.com/cosmos/cosmos-sdk/store/types"
"github.com/osmosis-labs/osmosis/v12/app/upgrades"
validatorpreferencetypes "github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
validatorpreferencetypes "github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"
)

// UpgradeName defines the on-chain upgrade name for the Osmosis v9 upgrade.
Expand Down
2 changes: 1 addition & 1 deletion app/upgrades/v13/upgrades.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/osmosis-labs/osmosis/v12/app/keepers"
"github.com/osmosis-labs/osmosis/v12/app/upgrades"
lockuptypes "github.com/osmosis-labs/osmosis/v12/x/lockup/types"
validatorpreferencetypes "github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
validatorpreferencetypes "github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"
)

func CreateUpgradeHandler(
Expand Down
4 changes: 2 additions & 2 deletions ...alidator-preference/v1beta1/genesis.proto → ...osmosis/valset-pref/v1beta1/genesis.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package osmosis.validatorpreference.v1beta1;

import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "osmosis/validator-preference/v1beta1/params.proto";
import "osmosis/valset-pref/v1beta1/params.proto";

option go_package = "github.com/osmosis-labs/osmosis/v12/x/validator-preference/types";
option go_package = "github.com/osmosis-labs/osmosis/v12/x/valset-pref/types";
option (gogoproto.goproto_getters_all) = false;

// GenesisState defines the validator-set preference module's genesis state.
Expand Down
2 changes: 1 addition & 1 deletion ...validator-preference/v1beta1/params.proto → .../osmosis/valset-pref/v1beta1/params.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
import "cosmos_proto/cosmos.proto";
import "cosmos/base/v1beta1/coin.proto";

option go_package = "github.com/osmosis-labs/osmosis/v12/x/validator-preference/types";
option go_package = "github.com/osmosis-labs/osmosis/v12/x/valset-pref/types";

// Params defines the parameters for the module.
message Params {
Expand Down
7 changes: 3 additions & 4 deletions .../validator-preference/v1beta1/query.proto → ...o/osmosis/valset-pref/v1beta1/query.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@ package osmosis.validatorpreference.v1beta1;

import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "osmosis/validator-preference/v1beta1/state.proto";
import "osmosis/valset-pref/v1beta1/state.proto";

option go_package = "github.com/osmosis-labs/osmosis/v12/x/validator-preference/client/queryproto";
option go_package = "github.com/osmosis-labs/osmosis/v12/x/valset-pref/client/queryproto";
option (gogoproto.goproto_getters_all) = false;

// Query defines the gRPC querier service.
service Query {
// Returns the list of ValidatorPreferences for the user.
rpc UserValidatorPreferences(QueryUserValidatorPreferences)
returns (QueryUserValidatorPreferenceResponse) {
option (google.api.http).get =
"/osmosis/validator-preference/v1beta1/{user}";
option (google.api.http).get = "/osmosis/valset-pref/v1beta1/{user}";
}
}

Expand Down
2 changes: 1 addition & 1 deletion .../validator-preference/v1beta1/state.proto → ...o/osmosis/valset-pref/v1beta1/state.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package osmosis.validatorpreference.v1beta1;
import "gogoproto/gogo.proto";
import "google/api/annotations.proto";

option go_package = "github.com/osmosis-labs/osmosis/v12/x/validator-preference/types";
option go_package = "github.com/osmosis-labs/osmosis/v12/x/valset-pref/types";
option (gogoproto.goproto_getters_all) = false;

// ValidatorPreference defines the message structure for
Expand Down
6 changes: 3 additions & 3 deletions ...sis/validator-preference/v1beta1/tx.proto → proto/osmosis/valset-pref/v1beta1/tx.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package osmosis.validatorpreference.v1beta1;

import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
import "osmosis/validator-preference/v1beta1/state.proto";
import "osmosis/valset-pref/v1beta1/state.proto";

option go_package = "github.com/osmosis-labs/osmosis/v12/x/validator-preference/types";
option go_package = "github.com/osmosis-labs/osmosis/v12/x/valset-pref/types";

// Msg defines the validator-preference modules's gRPC message service.
// Msg defines the valset-pref modules's gRPC message service.
service Msg {
// SetValidatorSetPreference creates a set of validator preference.
// This message will process both create + update request.
Expand Down
1 change: 0 additions & 1 deletion x/validator-preference/types/errors.go
View file

This file was deleted.

0 x/validator-preference/README.md → x/valset-pref/README.md
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...tor-preference/client/query_proto_wrap.go → x/valset-pref/client/query_proto_wrap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package client
import (
"context"

validatorprefkeeper "github.com/osmosis-labs/osmosis/v12/x/validator-preference"
"github.com/osmosis-labs/osmosis/v12/x/validator-preference/client/queryproto"
validatorprefkeeper "github.com/osmosis-labs/osmosis/v12/x/valset-pref"
"github.com/osmosis-labs/osmosis/v12/x/valset-pref/client/queryproto"
)

type Querier struct {
Expand Down
64 changes: 32 additions & 32 deletions ...-preference/client/queryproto/query.pb.go → x/valset-pref/client/queryproto/query.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...eference/client/queryproto/query.pb.gw.go → ...set-pref/client/queryproto/query.pb.gw.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion x/validator-preference/genesis.go → x/valset-pref/genesis.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package keeper

import (
"github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
"github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"

sdk "github.com/cosmos/cosmos-sdk/types"
)
Expand Down
2 changes: 1 addition & 1 deletion x/validator-preference/keeper.go → x/valset-pref/keeper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
"github.com/gogo/protobuf/proto"
"github.com/osmosis-labs/osmosis/v12/osmoutils"
"github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
"github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"
)

type Keeper struct {
Expand Down
2 changes: 1 addition & 1 deletion x/validator-preference/keeper_test.go → x/valset-pref/keeper_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
"github.com/osmosis-labs/osmosis/v12/app/apptesting"
"github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
"github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"
"github.com/stretchr/testify/suite"
)

Expand Down
2 changes: 1 addition & 1 deletion x/validator-preference/msg_server.go → x/valset-pref/msg_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
"github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"
)

type msgServer struct {
Expand Down
4 changes: 2 additions & 2 deletions x/validator-preference/msg_server_test.go → x/valset-pref/msg_server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package keeper_test

import (
sdk "github.com/cosmos/cosmos-sdk/types"
valPref "github.com/osmosis-labs/osmosis/v12/x/validator-preference"
"github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
valPref "github.com/osmosis-labs/osmosis/v12/x/valset-pref"
"github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"
)

func (suite *KeeperTestSuite) TestSetValidatorSetPreference() {
Expand Down
0 x/validator-preference/types/codec.go → x/valset-pref/types/codec.go
View file
File renamed without changes.
0 ...r-preference/types/expected_interfaces.go → x/valset-pref/types/expected_interfaces.go
View file
File renamed without changes.
0 x/validator-preference/types/genesis.go → x/valset-pref/types/genesis.go
View file
File renamed without changes.
42 changes: 21 additions & 21 deletions x/validator-preference/types/genesis.pb.go → x/valset-pref/types/genesis.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 x/validator-preference/types/keys.go → x/valset-pref/types/keys.go
View file
File renamed without changes.
0 x/validator-preference/types/msgs.go → x/valset-pref/types/msgs.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion x/validator-preference/types/msgs_test.go → x/valset-pref/types/msgs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

"github.com/osmosis-labs/osmosis/v12/app/apptesting"
appParams "github.com/osmosis-labs/osmosis/v12/app/params"
"github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
"github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"
)

func TestMsgSetValidatorSetPreference(t *testing.T) {
Expand Down
0 x/validator-preference/types/params.go → x/valset-pref/types/params.go
View file
File renamed without changes.
Loading

0 comments on commit bdff9b3

Please sign in to comment.