bez feedback

app/keepers/keepers.go

@@ -72,8 +72,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 {

app/keepers/modules.go

@@ -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.

app/modules.go

@@ -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

app/upgrades/v13/constants.go

@@ -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.

app/upgrades/v13/upgrades.go

@@ -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(

proto/osmosis/validator-preference/v1beta1/genesis.proto → proto/osmosis/valset-pref/v1beta1/genesis.proto

@@ -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.

proto/osmosis/validator-preference/v1beta1/params.proto → proto/osmosis/valset-pref/v1beta1/params.proto

@@ -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 {

proto/osmosis/validator-preference/v1beta1/query.proto → proto/osmosis/valset-pref/v1beta1/query.proto

@@ -3,9 +3,9 @@ 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.
@@ -13,8 +13,7 @@ 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}";
   }
 }
 

proto/osmosis/validator-preference/v1beta1/state.proto → proto/osmosis/valset-pref/v1beta1/state.proto

@@ -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

proto/osmosis/validator-preference/v1beta1/tx.proto → proto/osmosis/valset-pref/v1beta1/tx.proto

@@ -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.

x/validator-preference/types/errors.go

-package types

x/validator-preference/client/query_proto_wrap.go → x/valset-pref/client/query_proto_wrap.go

@@ -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 {

x/validator-preference/client/queryproto/query.pb.go → x/valset-pref/client/queryproto/query.pb.go

 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: osmosis/validator-preference/v1beta1/query.proto
+// source: osmosis/valset-pref/v1beta1/query.proto
 
 package queryproto
 
@@ -9,7 +9,7 @@ import (
 	_ "github.com/gogo/protobuf/gogoproto"
 	grpc1 "github.com/gogo/protobuf/grpc"
 	proto "github.com/gogo/protobuf/proto"
-	types "github.com/osmosis-labs/osmosis/v12/x/validator-preference/types"
+	types "github.com/osmosis-labs/osmosis/v12/x/valset-pref/types"
 	_ "google.golang.org/genproto/googleapis/api/annotations"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
@@ -40,7 +40,7 @@ func (m *QueryUserValidatorPreferences) Reset()         { *m = QueryUserValidato
 func (m *QueryUserValidatorPreferences) String() string { return proto.CompactTextString(m) }
 func (*QueryUserValidatorPreferences) ProtoMessage()    {}
 func (*QueryUserValidatorPreferences) Descriptor() ([]byte, []int) {
-	return fileDescriptor_888a45acbabdd269, []int{0}
+	return fileDescriptor_9ffbeb4123fe56ae, []int{0}
 }
 func (m *QueryUserValidatorPreferences) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -78,7 +78,7 @@ func (m *QueryUserValidatorPreferenceResponse) Reset()         { *m = QueryUserV
 func (m *QueryUserValidatorPreferenceResponse) String() string { return proto.CompactTextString(m) }
 func (*QueryUserValidatorPreferenceResponse) ProtoMessage()    {}
 func (*QueryUserValidatorPreferenceResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_888a45acbabdd269, []int{1}
+	return fileDescriptor_9ffbeb4123fe56ae, []int{1}
 }
 func (m *QueryUserValidatorPreferenceResponse) XXX_Unmarshal(b []byte) error {
 	return m.Unmarshal(b)
@@ -113,33 +113,33 @@ func init() {
 }
 
 func init() {
-	proto.RegisterFile("osmosis/validator-preference/v1beta1/query.proto", fileDescriptor_888a45acbabdd269)
-}
-
-var fileDescriptor_888a45acbabdd269 = []byte{
-	// 338 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x32, 0xc8, 0x2f, 0xce, 0xcd,
-	0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0x4b, 0xcc, 0xc9, 0x4c, 0x49, 0x2c, 0xc9, 0x2f, 0xd2, 0x2d, 0x28,
-	0x4a, 0x4d, 0x4b, 0x2d, 0x4a, 0xcd, 0x4b, 0x4e, 0xd5, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34,
-	0xd4, 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x52, 0x86, 0xea,
-	0xd0, 0x83, 0xeb, 0x40, 0x68, 0xd0, 0x83, 0x6a, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab,
-	0xd7, 0x07, 0xb1, 0x20, 0x5a, 0xa5, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x13, 0x0b,
-	0x32, 0xf5, 0x13, 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x8a, 0xa1, 0xb2, 0xc4,
-	0x39, 0xa5, 0xb8, 0x24, 0xb1, 0x24, 0x15, 0xa2, 0x43, 0xc9, 0x98, 0x4b, 0x36, 0x10, 0xe4, 0xb2,
-	0xd0, 0xe2, 0xd4, 0xa2, 0x30, 0x98, 0xa6, 0x00, 0xb8, 0x9e, 0x62, 0x21, 0x21, 0x2e, 0x96, 0xd2,
-	0xe2, 0xd4, 0x22, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x30, 0x5b, 0xa9, 0x83, 0x91, 0x4b,
-	0x05, 0x9f, 0xae, 0xa0, 0xd4, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0xa1, 0x04, 0x2e, 0x6e, 0x84,
-	0xfd, 0xc5, 0x12, 0x8c, 0x0a, 0xcc, 0x1a, 0xdc, 0x46, 0x16, 0x7a, 0x44, 0x78, 0x5f, 0x0f, 0x8b,
-	0xb1, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x21, 0x1b, 0x69, 0xf4, 0x92, 0x91, 0x8b, 0x15,
-	0xec, 0x14, 0xa1, 0xfb, 0x8c, 0x5c, 0x12, 0x38, 0x7d, 0xe1, 0x44, 0x94, 0x9d, 0x78, 0x43, 0x42,
-	0xca, 0x93, 0x62, 0x33, 0x60, 0xe1, 0xa2, 0x64, 0xd2, 0x74, 0xf9, 0xc9, 0x64, 0x26, 0x3d, 0x21,
-	0x1d, 0x7d, 0xa2, 0x22, 0xac, 0x1a, 0x14, 0xea, 0xb5, 0x4e, 0x59, 0x27, 0x1e, 0xca, 0x31, 0x9c,
-	0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31,
-	0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x4f, 0x7a, 0x66, 0x49, 0x46, 0x69,
-	0x92, 0x5e, 0x72, 0x7e, 0x2e, 0xcc, 0x54, 0xdd, 0x9c, 0xc4, 0xa4, 0x62, 0x84, 0x15, 0x86, 0x46,
-	0xfa, 0x15, 0xd8, 0x2d, 0x4a, 0xce, 0xc9, 0x4c, 0xcd, 0x2b, 0x81, 0xa4, 0x51, 0x70, 0xba, 0x48,
-	0x62, 0x03, 0x53, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x44, 0xbd, 0xf5, 0xa9, 0xdd, 0x02,
-	0x00, 0x00,
+	proto.RegisterFile("osmosis/valset-pref/v1beta1/query.proto", fileDescriptor_9ffbeb4123fe56ae)
+}
+
+var fileDescriptor_9ffbeb4123fe56ae = []byte{
+	// 342 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcf, 0x2f, 0xce, 0xcd,
+	0x2f, 0xce, 0x2c, 0xd6, 0x2f, 0x4b, 0xcc, 0x29, 0x4e, 0x2d, 0xd1, 0x2d, 0x28, 0x4a, 0x4d, 0xd3,
+	0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2b, 0x28,
+	0xca, 0x2f, 0xc9, 0x17, 0x52, 0x86, 0x2a, 0xd4, 0x2b, 0x4b, 0xcc, 0xc9, 0x4c, 0x49, 0x2c, 0xc9,
+	0x2f, 0x02, 0x29, 0x4d, 0x2d, 0x4a, 0xcd, 0x4b, 0x4e, 0xd5, 0x83, 0x6a, 0x90, 0x12, 0x49, 0xcf,
+	0x4f, 0xcf, 0x07, 0xab, 0xd7, 0x07, 0xb1, 0x20, 0x5a, 0xa5, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73,
+	0x52, 0xf5, 0x13, 0x0b, 0x32, 0xf5, 0x13, 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3,
+	0x8a, 0xa1, 0xb2, 0x78, 0x5d, 0x50, 0x5c, 0x92, 0x58, 0x92, 0x0a, 0x51, 0xa8, 0x64, 0xcc, 0x25,
+	0x1b, 0x08, 0x72, 0x50, 0x68, 0x71, 0x6a, 0x51, 0x18, 0xcc, 0x11, 0x01, 0x70, 0x47, 0x14, 0x0b,
+	0x09, 0x71, 0xb1, 0x94, 0x16, 0xa7, 0x16, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x81, 0xd9,
+	0x4a, 0x1d, 0x8c, 0x5c, 0x2a, 0xf8, 0x74, 0x05, 0xa5, 0x16, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x0a,
+	0x25, 0x70, 0x71, 0x23, 0x3c, 0x54, 0x2c, 0xc1, 0xa8, 0xc0, 0xac, 0xc1, 0x6d, 0x64, 0xa1, 0x47,
+	0x84, 0xaf, 0xf5, 0xb0, 0x18, 0xeb, 0xc4, 0x72, 0xe2, 0x9e, 0x3c, 0x43, 0x10, 0xb2, 0x91, 0x46,
+	0x0f, 0x18, 0xb9, 0x58, 0xc1, 0x4e, 0x11, 0xba, 0xc6, 0xc8, 0x25, 0x81, 0xd3, 0x17, 0x4e, 0x44,
+	0xd9, 0x89, 0x37, 0x24, 0xa4, 0x3c, 0x29, 0x36, 0x03, 0x16, 0x2e, 0x4a, 0xda, 0x4d, 0x97, 0x9f,
+	0x4c, 0x66, 0x52, 0x15, 0x52, 0xd6, 0xc7, 0x17, 0x4f, 0xd5, 0xa0, 0xc0, 0xae, 0x75, 0x4a, 0x3c,
+	0xf1, 0x50, 0x8e, 0xe1, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63,
+	0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x9c, 0xd3,
+	0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0x61, 0x86, 0xe9, 0xe6, 0x24, 0x26, 0x15,
+	0x23, 0x4c, 0x36, 0x34, 0xd2, 0xaf, 0x40, 0x31, 0x3f, 0x39, 0x27, 0x33, 0x35, 0xaf, 0x04, 0x92,
+	0x10, 0xc1, 0xa9, 0x20, 0x89, 0x0d, 0x4c, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x88, 0x49,
+	0x0d, 0xe4, 0xb9, 0x02, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -221,7 +221,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "osmosis/validator-preference/v1beta1/query.proto",
+	Metadata: "osmosis/valset-pref/v1beta1/query.proto",
 }
 
 func (m *QueryUserValidatorPreferences) Marshal() (dAtA []byte, err error) {

x/validator-preference/client/queryproto/query.pb.gw.go → x/valset-pref/client/queryproto/query.pb.gw.go

 // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.
-// source: osmosis/validator-preference/v1beta1/query.proto
+// source: osmosis/valset-pref/v1beta1/query.proto
 
 /*
 Package queryproto is a reverse proxy.
@@ -181,7 +181,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie
 }
 
 var (
-	pattern_Query_UserValidatorPreferences_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"osmosis", "validator-preference", "v1beta1", "user"}, "", runtime.AssumeColonVerbOpt(false)))
+	pattern_Query_UserValidatorPreferences_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"osmosis", "valset-pref", "v1beta1", "user"}, "", runtime.AssumeColonVerbOpt(false)))
 )
 
 var (

x/validator-preference/genesis.go → x/valset-pref/genesis.go

 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"
 )

x/validator-preference/keeper.go → x/valset-pref/keeper.go

@@ -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 {

x/validator-preference/keeper_test.go → x/valset-pref/keeper_test.go

@@ -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"
 )
 

x/validator-preference/msg_server.go → x/valset-pref/msg_server.go

@@ -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 {

x/validator-preference/msg_server_test.go → x/valset-pref/msg_server_test.go

@@ -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() {