Merge pull request DongCoNY#41 from onomyprotocol/dong/clean-auction

auction: clean auction

proto/reserve/auction/v1/query.proto

@@ -0,0 +1,29 @@
+syntax = "proto3";
+package reserve.auction.v1;
+
+import "amino/amino.proto";
+import "gogoproto/gogo.proto";
+import "google/api/annotations.proto";
+import "reserve/auction/v1/params.proto";
+import "cosmos_proto/cosmos.proto";
+
+option go_package = "github.com/onomyprotocol/reserve/x/auction/types";
+
+// Query defines the gRPC querier service.
+service Query {
+  // Parameters queries the parameters of the module.
+  rpc Params(QueryParamsRequest) returns (QueryParamsResponse) {
+    option (google.api.http).get = "/reserve/auction/params";
+  }
+}
+
+// QueryParamsRequest is request type for the Query/Params RPC method.
+message QueryParamsRequest {}
+
+// QueryParamsResponse is response type for the Query/Params RPC method.
+message QueryParamsResponse {
+  // params holds all the parameters of this module.
+  Params params = 1
+      [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
+}
+

proto/reserve/auction/v1/tx.proto

@@ -28,7 +28,7 @@ service Msg {
 // MsgUpdateParams is the Msg/UpdateParams request type.
 message MsgUpdateParams {
   option (cosmos.msg.v1.signer) = "authority";
-  option (amino.name) = "reserve/x/oracle/MsgUpdateParams";
+  option (amino.name) = "reserve/x/auction/MsgUpdateParams";
 
   // authority is the address that controls the module (defaults to x/gov unless
   // overwritten).

x/auction/client/cli/tx.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/client"
 	// "github.com/cosmos/cosmos-sdk/client/flags"
-	"github.com/onomyprotocol/reserve/x/oracle/types"
+	"github.com/onomyprotocol/reserve/x/auction/types"
 )
 
 var DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds())

x/auction/module/autocli.go

@@ -1,16 +1,16 @@
-package oracle
+package auction
 
 import (
 	autocliv1 "cosmossdk.io/api/cosmos/autocli/v1"
 
-	modulev1 "github.com/onomyprotocol/reserve/api/reserve/oracle"
+	"github.com/onomyprotocol/reserve/x/auction/types"
 )
 
 // AutoCLIOptions implements the autocli.HasAutoCLIConfig interface.
 func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
 	return &autocliv1.ModuleOptions{
 		Query: &autocliv1.ServiceCommandDescriptor{
-			Service: modulev1.Query_ServiceDesc.ServiceName,
+			Service: types.Query_serviceDesc.ServiceName,
 			RpcCommandOptions: []*autocliv1.RpcCommandOptions{
 				{
 					RpcMethod: "Params",
@@ -21,7 +21,7 @@ func (am AppModule) AutoCLIOptions() *autocliv1.ModuleOptions {
 			},
 		},
 		Tx: &autocliv1.ServiceCommandDescriptor{
-			Service:              modulev1.Msg_ServiceDesc.ServiceName,
+			Service:              types.Msg_serviceDesc.ServiceName,
 			EnhanceCustomCommand: true, // only required if you want to use the custom command
 			RpcCommandOptions: []*autocliv1.RpcCommandOptions{
 				{

x/auction/module/genesis.go

@@ -1,4 +1,4 @@
-package oracle
+package auction
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"

x/auction/module/genesis_test.go

@@ -1,4 +1,4 @@
-package oracle_test
+package auction_test
 
 import (
 	"testing"

x/auction/module/module.go

@@ -1,4 +1,4 @@
-package oracle
+package auction
 
 import (
 	"context"
@@ -185,8 +185,8 @@ type ModuleInputs struct {
 type ModuleOutputs struct {
 	depinject.Out
 
-	OracleKeeper keeper.Keeper
-	Module       appmodule.AppModule
+	AuctionKeeper keeper.Keeper
+	Module        appmodule.AppModule
 }
 
 func ProvideModule(in ModuleInputs) ModuleOutputs {
@@ -212,5 +212,5 @@ func ProvideModule(in ModuleInputs) ModuleOutputs {
 		in.BankKeeper,
 	)
 
-	return ModuleOutputs{OracleKeeper: k, Module: m}
+	return ModuleOutputs{AuctionKeeper: k, Module: m}
 }

x/auction/module/simulation.go

@@ -1,4 +1,4 @@
-package oracle
+package auction
 
 import (
 	"math/rand"
@@ -9,7 +9,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/simulation"
 
 	"github.com/onomyprotocol/reserve/testutil/sample"
-	"github.com/onomyprotocol/reserve/x/oracle/types"
+	"github.com/onomyprotocol/reserve/x/auction/types"
 )
 
 // avoid unused import issue
@@ -30,11 +30,11 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {
 	for i, acc := range simState.Accounts {
 		accs[i] = acc.Address.String()
 	}
-	oracleGenesis := types.GenesisState{
+	auctionGenesis := types.GenesisState{
 		Params: types.DefaultParams(),
 		// this line is used by starport scaffolding # simapp/module/genesisState
 	}
-	simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(&oracleGenesis)
+	simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(&auctionGenesis)
 }
 
 // RegisterStoreDecoder registers a decoder.

x/auction/types/msgs.go

@@ -0,0 +1,6 @@
+package types
+
+var (
+	Query_serviceDesc = _Query_serviceDesc
+	Msg_serviceDesc   = _Msg_serviceDesc
+)