diff --git a/app/app.go b/app/app.go index 0c8460a..f789159 100644 --- a/app/app.go +++ b/app/app.go @@ -98,17 +98,17 @@ import ( monitoringpkeeper "github.com/tendermint/spn/x/monitoringp/keeper" monitoringptypes "github.com/tendermint/spn/x/monitoringp/types" - "cosmos-test/docs" + "colinear/docs" - cosmostestmodule "cosmos-test/x/cosmostest" - cosmostestmodulekeeper "cosmos-test/x/cosmostest/keeper" - cosmostestmoduletypes "cosmos-test/x/cosmostest/types" + colinearmodule "colinear/x/colinear-core" + colinearmodulekeeper "colinear/x/colinear-core/keeper" + colinearmoduletypes "colinear/x/colinear-core/types" // this line is used by starport scaffolding # stargate/app/moduleImport ) const ( AccountAddressPrefix = "cosmos" - Name = "cosmos-test" + Name = "colinear" ) // this line is used by starport scaffolding # stargate/wasm/app/enabledProposals @@ -157,7 +157,7 @@ var ( transfer.AppModuleBasic{}, vesting.AppModuleBasic{}, monitoringp.AppModuleBasic{}, - cosmostestmodule.AppModuleBasic{}, + colinearmodule.AppModuleBasic{}, // this line is used by starport scaffolding # stargate/app/moduleBasic ) @@ -171,7 +171,7 @@ var ( govtypes.ModuleName: {authtypes.Burner}, ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, // auction module will only need escrow perms, not minting or burning - cosmostestmoduletypes.ModuleName: nil, + colinearmoduletypes.ModuleName: nil, // this line is used by starport scaffolding # stargate/app/maccPerms } ) @@ -232,7 +232,7 @@ type App struct { ScopedTransferKeeper capabilitykeeper.ScopedKeeper ScopedMonitoringKeeper capabilitykeeper.ScopedKeeper - CosmostestKeeper cosmostestmodulekeeper.Keeper + ColinearcoreKeeper colinearmodulekeeper.Keeper // this line is used by starport scaffolding # stargate/app/keeperDeclaration // mm is the module manager @@ -269,7 +269,7 @@ func New( minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey, govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey, monitoringptypes.StoreKey, - cosmostestmoduletypes.StoreKey, + colinearmoduletypes.StoreKey, // this line is used by starport scaffolding # stargate/app/storeKey ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) @@ -391,14 +391,14 @@ func New( ) monitoringModule := monitoringp.NewAppModule(appCodec, app.MonitoringKeeper) - app.CosmostestKeeper = *cosmostestmodulekeeper.NewKeeper( + app.ColinearcoreKeeper = *colinearmodulekeeper.NewKeeper( appCodec, - keys[cosmostestmoduletypes.StoreKey], - keys[cosmostestmoduletypes.MemStoreKey], - app.GetSubspace(cosmostestmoduletypes.ModuleName), + keys[colinearmoduletypes.StoreKey], + keys[colinearmoduletypes.MemStoreKey], + app.GetSubspace(colinearmoduletypes.ModuleName), app.BankKeeper, ) - cosmostestModule := cosmostestmodule.NewAppModule(appCodec, app.CosmostestKeeper, app.AccountKeeper, app.BankKeeper) + colinearModule := colinearmodule.NewAppModule(appCodec, app.ColinearcoreKeeper, app.AccountKeeper, app.BankKeeper) // this line is used by starport scaffolding # stargate/app/keeperDefinition @@ -441,7 +441,7 @@ func New( params.NewAppModule(app.ParamsKeeper), transferModule, monitoringModule, - cosmostestModule, + colinearModule, // this line is used by starport scaffolding # stargate/app/appModule ) @@ -469,7 +469,7 @@ func New( feegrant.ModuleName, paramstypes.ModuleName, monitoringptypes.ModuleName, - cosmostestmoduletypes.ModuleName, + colinearmoduletypes.ModuleName, // this line is used by starport scaffolding # stargate/app/beginBlockers ) @@ -493,7 +493,7 @@ func New( ibchost.ModuleName, ibctransfertypes.ModuleName, monitoringptypes.ModuleName, - cosmostestmoduletypes.ModuleName, + colinearmoduletypes.ModuleName, // this line is used by starport scaffolding # stargate/app/endBlockers ) @@ -522,7 +522,7 @@ func New( ibctransfertypes.ModuleName, feegrant.ModuleName, monitoringptypes.ModuleName, - cosmostestmoduletypes.ModuleName, + colinearmoduletypes.ModuleName, // this line is used by starport scaffolding # stargate/app/initGenesis ) @@ -547,7 +547,7 @@ func New( ibc.NewAppModule(app.IBCKeeper), transferModule, monitoringModule, - cosmostestModule, + colinearModule, // this line is used by starport scaffolding # stargate/app/appModule ) app.sm.RegisterStoreDecoders() @@ -737,7 +737,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(ibctransfertypes.ModuleName) paramsKeeper.Subspace(ibchost.ModuleName) paramsKeeper.Subspace(monitoringptypes.ModuleName) - paramsKeeper.Subspace(cosmostestmoduletypes.ModuleName) + paramsKeeper.Subspace(colinearmoduletypes.ModuleName) // this line is used by starport scaffolding # stargate/app/paramSubspace return paramsKeeper diff --git a/app/simulation_test.go b/app/simulation_test.go index 330102d..3b68d22 100644 --- a/app/simulation_test.go +++ b/app/simulation_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "cosmos-test/app" + "colinear/app" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" diff --git a/cmd/cosmos-testd/main.go b/cmd/colineard/main.go similarity index 95% rename from cmd/cosmos-testd/main.go rename to cmd/colineard/main.go index b622faf..c72015d 100644 --- a/cmd/cosmos-testd/main.go +++ b/cmd/colineard/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "cosmos-test/app" + "colinear/app" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" "github.com/ignite/cli/ignite/pkg/cosmoscmd" diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 8887b7d..0676e53 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -20122,10 +20122,10 @@ paths: format: int64 tags: - Query - /cosmos-test/cosmostest/auction: + /colinear/colinear/auction: get: summary: Queries a list of Auction items. - operationId: CosmostestCosmostestAuctionAll + operationId: ColinearcoreColinearcoreAuctionAll responses: '200': description: A successful response. @@ -20261,10 +20261,10 @@ paths: type: boolean tags: - Query - '/cosmos-test/cosmostest/auction/{index}': + '/colinear/colinear/auction/{index}': get: summary: Queries a Auction by index. - operationId: CosmostestCosmostestAuction + operationId: ColinearcoreColinearcoreAuction responses: '200': description: A successful response. @@ -20329,10 +20329,10 @@ paths: type: string tags: - Query - '/cosmos-test/cosmostest/auction_bids/{index}': + '/colinear/colinear/auction_bids/{index}': get: summary: Queries a list of AuctionBids items. - operationId: CosmostestCosmostestAuctionBids + operationId: ColinearcoreColinearcoreAuctionBids responses: '200': description: A successful response. @@ -20373,10 +20373,10 @@ paths: type: string tags: - Query - /cosmos-test/cosmostest/next_auction: + /colinear/colinear/next_auction: get: summary: Queries a NextAuction by index. - operationId: CosmostestCosmostestNextAuction + operationId: ColinearcoreColinearcoreNextAuction responses: '200': description: A successful response. @@ -20409,10 +20409,10 @@ paths: additionalProperties: {} tags: - Query - /cosmos-test/cosmostest/params: + /colinear/colinear/params: get: summary: Parameters queries the parameters of the module. - operationId: CosmostestCosmostestParams + operationId: ColinearcoreColinearcoreParams responses: '200': description: A successful response. @@ -47465,7 +47465,7 @@ definitions: description: >- MsgCreateVestingAccountResponse defines the Msg/CreateVestingAccount response type. - cosmostest.cosmostest.Auction: + colinear.colinear.Auction: type: object properties: index: @@ -47498,30 +47498,30 @@ definitions: format: uint64 remaining: type: string - cosmostest.cosmostest.Bid: + colinear.colinear.Bid: type: object properties: owner: type: string amount: type: string - cosmostest.cosmostest.MsgNewAuctionResponse: + colinear.colinear.MsgNewAuctionResponse: type: object properties: auctionId: type: string - cosmostest.cosmostest.MsgNewBidResponse: + colinear.colinear.MsgNewBidResponse: type: object - cosmostest.cosmostest.NextAuction: + colinear.colinear.NextAuction: type: object properties: auctionId: type: string format: uint64 - cosmostest.cosmostest.Params: + colinear.colinear.Params: type: object description: Params defines the parameters for the module. - cosmostest.cosmostest.QueryAllAuctionResponse: + colinear.colinear.QueryAllAuctionResponse: type: object properties: auction: @@ -47584,7 +47584,7 @@ definitions: repeated Bar results = 1; PageResponse page = 2; } - cosmostest.cosmostest.QueryAuctionBidsResponse: + colinear.colinear.QueryAuctionBidsResponse: type: object properties: bids: @@ -47596,7 +47596,7 @@ definitions: type: string amount: type: string - cosmostest.cosmostest.QueryGetAuctionResponse: + colinear.colinear.QueryGetAuctionResponse: type: object properties: auction: @@ -47632,7 +47632,7 @@ definitions: format: uint64 remaining: type: string - cosmostest.cosmostest.QueryGetNextAuctionResponse: + colinear.colinear.QueryGetNextAuctionResponse: type: object properties: NextAuction: @@ -47641,7 +47641,7 @@ definitions: auctionId: type: string format: uint64 - cosmostest.cosmostest.QueryParamsResponse: + colinear.colinear.QueryParamsResponse: type: object properties: params: diff --git a/go.mod b/go.mod index ff93dce..9e8b8e6 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module cosmos-test +module colinear go 1.18 diff --git a/proto/cosmostest/auction.proto b/proto/colinear-core/auction.proto similarity index 71% rename from proto/cosmostest/auction.proto rename to proto/colinear-core/auction.proto index 0ec7c88..067b04b 100644 --- a/proto/cosmostest/auction.proto +++ b/proto/colinear-core/auction.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package cosmostest.cosmostest; +package colinear.colinearcore; -option go_package = "cosmos-test/x/cosmostest/types"; +option go_package = "colinear/x/colinear-core/types"; -import "cosmostest/bid.proto"; +import "colinear/bid.proto"; message Auction { string index = 1; diff --git a/proto/colinear-core/bid.proto b/proto/colinear-core/bid.proto new file mode 100644 index 0000000..55e43c3 --- /dev/null +++ b/proto/colinear-core/bid.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; +package colinear.colinearcore; + +option go_package = "colinear/x/colinear-core/types"; + +message Bid { + + string owner = 1; + string amount = 2; +} diff --git a/proto/cosmostest/genesis.proto b/proto/colinear-core/genesis.proto similarity index 58% rename from proto/cosmostest/genesis.proto rename to proto/colinear-core/genesis.proto index 3675e5b..1404379 100644 --- a/proto/cosmostest/genesis.proto +++ b/proto/colinear-core/genesis.proto @@ -1,15 +1,15 @@ syntax = "proto3"; -package cosmostest.cosmostest; +package colinear.colinearcore; import "gogoproto/gogo.proto"; -import "cosmostest/params.proto"; -import "cosmostest/next_auction.proto"; -import "cosmostest/auction.proto"; +import "colinear/params.proto"; +import "colinear/next_auction.proto"; +import "colinear/auction.proto"; // this line is used by starport scaffolding # genesis/proto/import -option go_package = "cosmos-test/x/cosmostest/types"; +option go_package = "colinear/x/colinear-core/types"; -// GenesisState defines the cosmostest module's genesis state. +// GenesisState defines the colinear module's genesis state. message GenesisState { Params params = 1 [(gogoproto.nullable) = false]; NextAuction nextAuction = 2; diff --git a/proto/colinear-core/next_auction.proto b/proto/colinear-core/next_auction.proto new file mode 100644 index 0000000..6ee5b25 --- /dev/null +++ b/proto/colinear-core/next_auction.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; +package colinear.colinearcore; + +option go_package = "colinear/x/colinear-core/types"; + +message NextAuction { + uint64 auctionId = 1; +} diff --git a/proto/cosmostest/params.proto b/proto/colinear-core/params.proto similarity index 66% rename from proto/cosmostest/params.proto rename to proto/colinear-core/params.proto index fe5cc9f..78623d1 100644 --- a/proto/cosmostest/params.proto +++ b/proto/colinear-core/params.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package cosmostest.cosmostest; +package colinear.colinearcore; import "gogoproto/gogo.proto"; -option go_package = "cosmos-test/x/cosmostest/types"; +option go_package = "colinear/x/colinear-core/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/cosmostest/query.proto b/proto/colinear-core/query.proto similarity index 76% rename from proto/cosmostest/query.proto rename to proto/colinear-core/query.proto index 41517b4..4e4422a 100644 --- a/proto/cosmostest/query.proto +++ b/proto/colinear-core/query.proto @@ -1,40 +1,40 @@ syntax = "proto3"; -package cosmostest.cosmostest; +package colinear.colinearcore; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "cosmostest/params.proto"; -import "cosmostest/next_auction.proto"; -import "cosmostest/auction.proto"; -import "cosmostest/bid.proto"; +import "colinear/params.proto"; +import "colinear/next_auction.proto"; +import "colinear/auction.proto"; +import "colinear/bid.proto"; // this line is used by starport scaffolding # 1 -option go_package = "cosmos-test/x/cosmostest/types"; +option go_package = "colinear/x/colinear-core/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 = "/cosmos-test/cosmostest/params"; + option (google.api.http).get = "/colinear/colinear/params"; } // Queries a NextAuction by index. rpc NextAuction(QueryGetNextAuctionRequest) returns (QueryGetNextAuctionResponse) { - option (google.api.http).get = "/cosmos-test/cosmostest/next_auction"; + option (google.api.http).get = "/colinear/colinear/next_auction"; } // Queries a Auction by index. rpc Auction(QueryGetAuctionRequest) returns (QueryGetAuctionResponse) { - option (google.api.http).get = "/cosmos-test/cosmostest/auction/{index}"; + option (google.api.http).get = "/colinear/colinear/auction/{index}"; } // Queries a list of Auction items. rpc AuctionAll(QueryAllAuctionRequest) returns (QueryAllAuctionResponse) { - option (google.api.http).get = "/cosmos-test/cosmostest/auction"; + option (google.api.http).get = "/colinear/colinear/auction"; } // Queries a list of AuctionBids items. rpc AuctionBids(QueryAuctionBidsRequest) returns (QueryAuctionBidsResponse) { - option (google.api.http).get = "/cosmos-test/cosmostest/auction_bids/{index}"; + option (google.api.http).get = "/colinear/colinear/auction_bids/{index}"; } // this line is used by starport scaffolding # 2 diff --git a/proto/cosmostest/tx.proto b/proto/colinear-core/tx.proto similarity index 89% rename from proto/cosmostest/tx.proto rename to proto/colinear-core/tx.proto index 14b6663..296dca8 100644 --- a/proto/cosmostest/tx.proto +++ b/proto/colinear-core/tx.proto @@ -1,9 +1,9 @@ syntax = "proto3"; -package cosmostest.cosmostest; +package colinear.colinearcore; // this line is used by starport scaffolding # proto/tx/import -option go_package = "cosmos-test/x/cosmostest/types"; +option go_package = "colinear/x/colinear-core/types"; // Msg defines the Msg service. service Msg { diff --git a/proto/cosmostest/bid.proto b/proto/cosmostest/bid.proto deleted file mode 100644 index b8be7b4..0000000 --- a/proto/cosmostest/bid.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto3"; -package cosmostest.cosmostest; - -option go_package = "cosmos-test/x/cosmostest/types"; - -message Bid { - - string owner = 1; - string amount = 2; -} diff --git a/proto/cosmostest/next_auction.proto b/proto/cosmostest/next_auction.proto deleted file mode 100644 index 61efa2c..0000000 --- a/proto/cosmostest/next_auction.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto3"; -package cosmostest.cosmostest; - -option go_package = "cosmos-test/x/cosmostest/types"; - -message NextAuction { - uint64 auctionId = 1; -} diff --git a/sdk-readme.md b/sdk-readme.md index 2e3dba7..c5cb0a3 100644 --- a/sdk-readme.md +++ b/sdk-readme.md @@ -1,5 +1,5 @@ -# cosmostest -**cosmostest** is a blockchain built using Cosmos SDK and Tendermint and created with [Ignite CLI](https://ignite.com/cli). +# colinear +**colinear** is a blockchain built using Cosmos SDK and Tendermint and created with [Ignite CLI](https://ignite.com/cli). ## Get started @@ -39,9 +39,9 @@ After a draft release is created, make your final changes from the release page To install the latest version of your blockchain node's binary, execute the following command on your machine: ``` -curl https://get.ignite.com/username/cosmos-test@latest! | sudo bash +curl https://get.ignite.com/username/colinear@latest! | sudo bash ``` -`username/cosmos-test` should match the `username` and `repo_name` of the Github repository to which the source code was pushed. Learn more about [the install process](https://github.com/allinbits/starport-installer). +`username/colinear` should match the `username` and `repo_name` of the Github repository to which the source code was pushed. Learn more about [the install process](https://github.com/allinbits/starport-installer). ## Learn more diff --git a/tests/test_auction_flow.sh b/tests/test_auction_flow.sh index c212a3c..b82d8bc 100755 --- a/tests/test_auction_flow.sh +++ b/tests/test_auction_flow.sh @@ -4,47 +4,47 @@ HERE=$(cd $(dirname $BASH_SOURCE) && pwd) source $HERE/testutil.sh -cosmos-testd tx cosmostest new-auction asdf asdf 200 token $(now + 3500) \ +colineard tx colinear new-auction asdf asdf 200 token $(now + 3500) \ -y --from bob \ | expect_fail "Can't create auction below min lease period" -cosmos-testd tx cosmostest new-auction asdf asdf 200 token $(now + 8200000) \ +colineard tx colinear new-auction asdf asdf 200 token $(now + 8200000) \ -y --from bob \ | expect_fail "Can't create auction above max lease period" before=$(get_balance $BOB token) -cosmos-testd tx cosmostest new-auction asdf asdf 200 token $(now + 3700) \ +colineard tx colinear new-auction asdf asdf 200 token $(now + 3700) \ -y --from bob \ | expect_success "New auction is created" get_balance $BOB token | expect_change -200 $before "Change in Bob's balance" -cosmos-testd tx cosmostest new-bid $(get_last_auction_index) 100 \ +colineard tx colinear new-bid $(get_last_auction_index) 100 \ -y --from alice \ | expect_success "New bid is correctly created" -cosmos-testd tx cosmostest new-bid $(get_last_auction_index) 90 \ +colineard tx colinear new-bid $(get_last_auction_index) 90 \ -y --from alice \ | expect_success "Can bid below price ceiling" -cosmos-testd tx cosmostest new-bid $(get_last_auction_index) 100 \ +colineard tx colinear new-bid $(get_last_auction_index) 100 \ -y --from alice \ | expect_fail "Can't create duplicate bids" -cosmos-testd tx cosmostest new-bid $(get_next_auction_index) 100 \ +colineard tx colinear new-bid $(get_next_auction_index) 100 \ -y --from alice \ | expect_fail "Can't create bids for nonexistent auctions" -cosmos-testd tx cosmostest new-bid $(get_last_auction_index) 600 \ +colineard tx colinear new-bid $(get_last_auction_index) 600 \ -y --from alice \ | expect_fail "Can't bid over price ceiling" -cosmos-testd tx cosmostest new-bid $(get_last_auction_index) 0 \ +colineard tx colinear new-bid $(get_last_auction_index) 0 \ -y --from alice \ | expect_fail "Can't bid 0 tokens" -cosmos-testd q cosmostest auction-bids $(get_last_auction_index) \ +colineard q colinear auction-bids $(get_last_auction_index) \ | jq -M ".bids | length" \ | assert_eq 2 "Number of auction bids" @@ -55,11 +55,11 @@ before=$(get_balance $BOB token) log_info "Waiting 12s until auction expires..." sleep 12 -cosmos-testd tx cosmostest new-bid $(get_last_auction_index) 50 \ +colineard tx colinear new-bid $(get_last_auction_index) 50 \ -y --from alice \ | expect_fail "Can't add bids after auction expiry" -cosmos-testd q cosmostest show-auction $(get_last_auction_index) \ +colineard q colinear show-auction $(get_last_auction_index) \ | jq -rM ".auction.best.amount" \ | assert_eq 90 "Remaining vested amount from finalized top bid" diff --git a/tests/testutil.sh b/tests/testutil.sh index 5065f10..357876d 100644 --- a/tests/testutil.sh +++ b/tests/testutil.sh @@ -2,9 +2,9 @@ # Configuration options that all tests must include set -e -cosmos-testd config chain-id cosmostest -cosmos-testd config output json -cosmos-testd config broadcast-mode block +colineard config chain-id colinear +colineard config output json +colineard config broadcast-mode block # Test config addresses (Alice & Bob) accounts=$(curl -s http://localhost:1317/cosmos/auth/v1beta1/accounts | jq -M ".accounts") @@ -44,7 +44,7 @@ function expect_change { function get_balance { local addr=$1 local denom=$2 - cosmos-testd q bank balances $addr \ + colineard q bank balances $addr \ | jq -rM ".balances[] | select(.denom == \"$denom\") | .amount" } @@ -69,12 +69,12 @@ function get_key { } function get_last_auction_index { - res=$(cosmos-testd q cosmostest show-next-auction | jq -M ".NextAuction.auctionId | tonumber") + res=$(colineard q colinear show-next-auction | jq -M ".NextAuction.auctionId | tonumber") echo "$res-1" | bc } function get_next_auction_index { - cosmos-testd q cosmostest show-next-auction | jq -M ".NextAuction.auctionId | tonumber" + colineard q colinear show-next-auction | jq -M ".NextAuction.auctionId | tonumber" } function now { diff --git a/testutil/keeper/cosmostest.go b/testutil/keeper/cosmostest.go index cd0b016..c04e2ff 100644 --- a/testutil/keeper/cosmostest.go +++ b/testutil/keeper/cosmostest.go @@ -3,8 +3,8 @@ package keeper import ( "testing" - "cosmos-test/x/cosmostest/keeper" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/keeper" + "colinear/x/colinear-core/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -18,7 +18,7 @@ import ( tmdb "github.com/tendermint/tm-db" ) -func CosmostestKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { +func ColinearcoreKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { storeKey := sdk.NewKVStoreKey(types.StoreKey) memStoreKey := storetypes.NewMemoryStoreKey(types.MemStoreKey) @@ -35,7 +35,7 @@ func CosmostestKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) { types.Amino, storeKey, memStoreKey, - "CosmostestParams", + "ColinearcoreParams", ) k := keeper.NewKeeper( diff --git a/testutil/network/network.go b/testutil/network/network.go index 3631ed7..319f799 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -18,7 +18,7 @@ import ( tmrand "github.com/tendermint/tendermint/libs/rand" tmdb "github.com/tendermint/tm-db" - "cosmos-test/app" + "colinear/app" ) type ( diff --git a/x/cosmostest/auctionconfig/config.go b/x/colinear-core/auctionconfig/config.go similarity index 100% rename from x/cosmostest/auctionconfig/config.go rename to x/colinear-core/auctionconfig/config.go diff --git a/x/cosmostest/client/cli/query.go b/x/colinear-core/client/cli/query.go similarity index 91% rename from x/cosmostest/client/cli/query.go rename to x/colinear-core/client/cli/query.go index a29b8b6..1d89cb1 100644 --- a/x/cosmostest/client/cli/query.go +++ b/x/colinear-core/client/cli/query.go @@ -10,12 +10,12 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" ) // GetQueryCmd returns the cli query commands for this module func GetQueryCmd(queryRoute string) *cobra.Command { - // Group cosmostest queries under a subcommand + // Group colinear queries under a subcommand cmd := &cobra.Command{ Use: types.ModuleName, Short: fmt.Sprintf("Querying commands for the %s module", types.ModuleName), diff --git a/x/cosmostest/client/cli/query_auction.go b/x/colinear-core/client/cli/query_auction.go similarity index 97% rename from x/cosmostest/client/cli/query_auction.go rename to x/colinear-core/client/cli/query_auction.go index 4cd4481..d6322b9 100644 --- a/x/cosmostest/client/cli/query_auction.go +++ b/x/colinear-core/client/cli/query_auction.go @@ -3,7 +3,8 @@ package cli import ( "context" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" diff --git a/x/cosmostest/client/cli/query_auction_bids.go b/x/colinear-core/client/cli/query_auction_bids.go similarity index 95% rename from x/cosmostest/client/cli/query_auction_bids.go rename to x/colinear-core/client/cli/query_auction_bids.go index fc10ddd..64eee11 100644 --- a/x/cosmostest/client/cli/query_auction_bids.go +++ b/x/colinear-core/client/cli/query_auction_bids.go @@ -3,7 +3,8 @@ package cli import ( "strconv" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" diff --git a/x/cosmostest/client/cli/query_auction_test.go b/x/colinear-core/client/cli/query_auction_test.go similarity index 96% rename from x/cosmostest/client/cli/query_auction_test.go rename to x/colinear-core/client/cli/query_auction_test.go index 3262da1..583bda6 100644 --- a/x/cosmostest/client/cli/query_auction_test.go +++ b/x/colinear-core/client/cli/query_auction_test.go @@ -12,10 +12,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "cosmos-test/testutil/network" - "cosmos-test/testutil/nullify" - "cosmos-test/x/cosmostest/client/cli" - "cosmos-test/x/cosmostest/types" + "colinear/testutil/network" + "colinear/testutil/nullify" + "colinear/x/colinear-core/client/cli" + "colinear/x/colinear-core/types" ) // Prevent strconv unused error diff --git a/x/cosmostest/client/cli/query_next_auction.go b/x/colinear-core/client/cli/query_next_auction.go similarity index 95% rename from x/cosmostest/client/cli/query_next_auction.go rename to x/colinear-core/client/cli/query_next_auction.go index dfd489c..ef92d8c 100644 --- a/x/cosmostest/client/cli/query_next_auction.go +++ b/x/colinear-core/client/cli/query_next_auction.go @@ -3,7 +3,8 @@ package cli import ( "context" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" diff --git a/x/cosmostest/client/cli/query_next_auction_test.go b/x/colinear-core/client/cli/query_next_auction_test.go similarity index 92% rename from x/cosmostest/client/cli/query_next_auction_test.go rename to x/colinear-core/client/cli/query_next_auction_test.go index 3efad36..5e1cee0 100644 --- a/x/cosmostest/client/cli/query_next_auction_test.go +++ b/x/colinear-core/client/cli/query_next_auction_test.go @@ -9,10 +9,10 @@ import ( tmcli "github.com/tendermint/tendermint/libs/cli" "google.golang.org/grpc/status" - "cosmos-test/testutil/network" - "cosmos-test/testutil/nullify" - "cosmos-test/x/cosmostest/client/cli" - "cosmos-test/x/cosmostest/types" + "colinear/testutil/network" + "colinear/testutil/nullify" + "colinear/x/colinear-core/client/cli" + "colinear/x/colinear-core/types" ) func networkWithNextAuctionObjects(t *testing.T) (*network.Network, types.NextAuction) { diff --git a/x/cosmostest/client/cli/query_params.go b/x/colinear-core/client/cli/query_params.go similarity index 95% rename from x/cosmostest/client/cli/query_params.go rename to x/colinear-core/client/cli/query_params.go index 856b5f7..5806347 100644 --- a/x/cosmostest/client/cli/query_params.go +++ b/x/colinear-core/client/cli/query_params.go @@ -3,7 +3,8 @@ package cli import ( "context" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/spf13/cobra" diff --git a/x/cosmostest/client/cli/tx.go b/x/colinear-core/client/cli/tx.go similarity index 96% rename from x/cosmostest/client/cli/tx.go rename to x/colinear-core/client/cli/tx.go index 7fc04e6..8c9bc19 100644 --- a/x/cosmostest/client/cli/tx.go +++ b/x/colinear-core/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" // "github.com/cosmos/cosmos-sdk/client/flags" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" ) var ( diff --git a/x/cosmostest/client/cli/tx_new_auction.go b/x/colinear-core/client/cli/tx_new_auction.go similarity index 97% rename from x/cosmostest/client/cli/tx_new_auction.go rename to x/colinear-core/client/cli/tx_new_auction.go index 815275c..3b5aa50 100644 --- a/x/cosmostest/client/cli/tx_new_auction.go +++ b/x/colinear-core/client/cli/tx_new_auction.go @@ -3,7 +3,7 @@ package cli import ( "strconv" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/cosmostest/client/cli/tx_new_bid.go b/x/colinear-core/client/cli/tx_new_bid.go similarity index 96% rename from x/cosmostest/client/cli/tx_new_bid.go rename to x/colinear-core/client/cli/tx_new_bid.go index 5070dec..50614d5 100644 --- a/x/cosmostest/client/cli/tx_new_bid.go +++ b/x/colinear-core/client/cli/tx_new_bid.go @@ -3,7 +3,7 @@ package cli import ( "strconv" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" diff --git a/x/cosmostest/genesis.go b/x/colinear-core/genesis.go similarity index 91% rename from x/cosmostest/genesis.go rename to x/colinear-core/genesis.go index 89af165..b2d01b9 100644 --- a/x/cosmostest/genesis.go +++ b/x/colinear-core/genesis.go @@ -1,8 +1,9 @@ -package cosmostest +package colinearcore import ( - "cosmos-test/x/cosmostest/keeper" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/keeper" + "colinear/x/colinear-core/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/cosmostest/genesis_test.go b/x/colinear-core/genesis_test.go similarity index 69% rename from x/cosmostest/genesis_test.go rename to x/colinear-core/genesis_test.go index 16aa285..c73d0ba 100644 --- a/x/cosmostest/genesis_test.go +++ b/x/colinear-core/genesis_test.go @@ -1,12 +1,12 @@ -package cosmostest_test +package colinearcore_test import ( "testing" - keepertest "cosmos-test/testutil/keeper" - "cosmos-test/testutil/nullify" - "cosmos-test/x/cosmostest" - "cosmos-test/x/cosmostest/types" + keepertest "colinear/testutil/keeper" + "colinear/testutil/nullify" + colinear "colinear/x/colinear-core" + "colinear/x/colinear-core/types" "github.com/stretchr/testify/require" ) @@ -29,9 +29,9 @@ func TestGenesis(t *testing.T) { // this line is used by starport scaffolding # genesis/test/state } - k, ctx := keepertest.CosmostestKeeper(t) - cosmostest.InitGenesis(ctx, *k, genesisState) - got := cosmostest.ExportGenesis(ctx, *k) + k, ctx := keepertest.ColinearcoreKeeper(t) + colinear.InitGenesis(ctx, *k, genesisState) + got := colinear.ExportGenesis(ctx, *k) require.NotNil(t, got) nullify.Fill(&genesisState) diff --git a/x/cosmostest/handler.go b/x/colinear-core/handler.go similarity index 90% rename from x/cosmostest/handler.go rename to x/colinear-core/handler.go index b378a06..6cf78aa 100644 --- a/x/cosmostest/handler.go +++ b/x/colinear-core/handler.go @@ -1,10 +1,11 @@ -package cosmostest +package colinearcore import ( "fmt" - "cosmos-test/x/cosmostest/keeper" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/keeper" + "colinear/x/colinear-core/types" + sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/cosmostest/keeper/auction.go b/x/colinear-core/keeper/auction.go similarity index 97% rename from x/cosmostest/keeper/auction.go rename to x/colinear-core/keeper/auction.go index be35eff..1314a42 100644 --- a/x/cosmostest/keeper/auction.go +++ b/x/colinear-core/keeper/auction.go @@ -1,7 +1,7 @@ package keeper import ( - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/cosmostest/keeper/auction_state.go b/x/colinear-core/keeper/auction_state.go similarity index 93% rename from x/cosmostest/keeper/auction_state.go rename to x/colinear-core/keeper/auction_state.go index ce81fb2..81dae0b 100644 --- a/x/cosmostest/keeper/auction_state.go +++ b/x/colinear-core/keeper/auction_state.go @@ -1,9 +1,9 @@ package keeper import ( - "cosmos-test/x/cosmostest/math" - "cosmos-test/x/cosmostest/memdb" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/math" + "colinear/x/colinear-core/memdb" + "colinear/x/colinear-core/types" "log" "math/big" "time" @@ -107,7 +107,7 @@ func (k *Keeper) PayAuctionAmountDue(ctx sdk.Context, auctionId string) error { return err } coins := sdk.NewCoins(sdk.NewCoin(auction.Denom, sdk.NewIntFromBigInt(amt))) - err = k.bank.SendCoinsFromModuleToAccount(ctx, "cosmostest", sdk.AccAddress(auction.Best.Owner), coins) + err = k.bank.SendCoinsFromModuleToAccount(ctx, "colinear", sdk.AccAddress(auction.Best.Owner), coins) return err } } diff --git a/x/cosmostest/keeper/auction_test.go b/x/colinear-core/keeper/auction_test.go similarity index 79% rename from x/cosmostest/keeper/auction_test.go rename to x/colinear-core/keeper/auction_test.go index 3c53a79..040cbe0 100644 --- a/x/cosmostest/keeper/auction_test.go +++ b/x/colinear-core/keeper/auction_test.go @@ -4,10 +4,11 @@ import ( "strconv" "testing" - keepertest "cosmos-test/testutil/keeper" - "cosmos-test/testutil/nullify" - "cosmos-test/x/cosmostest/keeper" - "cosmos-test/x/cosmostest/types" + keepertest "colinear/testutil/keeper" + "colinear/testutil/nullify" + "colinear/x/colinear-core/keeper" + "colinear/x/colinear-core/types" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" ) @@ -26,7 +27,7 @@ func createNAuction(keeper *keeper.Keeper, ctx sdk.Context, n int) []types.Aucti } func TestAuctionGet(t *testing.T) { - keeper, ctx := keepertest.CosmostestKeeper(t) + keeper, ctx := keepertest.ColinearcoreKeeper(t) items := createNAuction(keeper, ctx, 10) for _, item := range items { rst, found := keeper.GetAuction(ctx, @@ -40,7 +41,7 @@ func TestAuctionGet(t *testing.T) { } } func TestAuctionRemove(t *testing.T) { - keeper, ctx := keepertest.CosmostestKeeper(t) + keeper, ctx := keepertest.ColinearcoreKeeper(t) items := createNAuction(keeper, ctx, 10) for _, item := range items { keeper.RemoveAuction(ctx, @@ -54,7 +55,7 @@ func TestAuctionRemove(t *testing.T) { } func TestAuctionGetAll(t *testing.T) { - keeper, ctx := keepertest.CosmostestKeeper(t) + keeper, ctx := keepertest.ColinearcoreKeeper(t) items := createNAuction(keeper, ctx, 10) require.ElementsMatch(t, nullify.Fill(items), diff --git a/x/cosmostest/keeper/grpc_query.go b/x/colinear-core/keeper/grpc_query.go similarity index 64% rename from x/cosmostest/keeper/grpc_query.go rename to x/colinear-core/keeper/grpc_query.go index 2d41af8..b92506c 100644 --- a/x/cosmostest/keeper/grpc_query.go +++ b/x/colinear-core/keeper/grpc_query.go @@ -1,7 +1,7 @@ package keeper import ( - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/cosmostest/keeper/grpc_query_auction.go b/x/colinear-core/keeper/grpc_query_auction.go similarity index 97% rename from x/cosmostest/keeper/grpc_query_auction.go rename to x/colinear-core/keeper/grpc_query_auction.go index 60c0c73..393ef0c 100644 --- a/x/cosmostest/keeper/grpc_query_auction.go +++ b/x/colinear-core/keeper/grpc_query_auction.go @@ -3,7 +3,8 @@ package keeper import ( "context" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" + "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" diff --git a/x/cosmostest/keeper/grpc_query_auction_bids.go b/x/colinear-core/keeper/grpc_query_auction_bids.go similarity index 92% rename from x/cosmostest/keeper/grpc_query_auction_bids.go rename to x/colinear-core/keeper/grpc_query_auction_bids.go index e9ff565..e01d6a4 100644 --- a/x/cosmostest/keeper/grpc_query_auction_bids.go +++ b/x/colinear-core/keeper/grpc_query_auction_bids.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "cosmos-test/x/cosmostest/memdb" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/memdb" + "colinear/x/colinear-core/types" sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" diff --git a/x/cosmostest/keeper/grpc_query_auction_test.go b/x/colinear-core/keeper/grpc_query_auction_test.go similarity index 93% rename from x/cosmostest/keeper/grpc_query_auction_test.go rename to x/colinear-core/keeper/grpc_query_auction_test.go index 4e86ed4..636c658 100644 --- a/x/cosmostest/keeper/grpc_query_auction_test.go +++ b/x/colinear-core/keeper/grpc_query_auction_test.go @@ -10,16 +10,16 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "cosmos-test/testutil/keeper" - "cosmos-test/testutil/nullify" - "cosmos-test/x/cosmostest/types" + keepertest "colinear/testutil/keeper" + "colinear/testutil/nullify" + "colinear/x/colinear-core/types" ) // Prevent strconv unused error var _ = strconv.IntSize func TestAuctionQuerySingle(t *testing.T) { - keeper, ctx := keepertest.CosmostestKeeper(t) + keeper, ctx := keepertest.ColinearcoreKeeper(t) wctx := sdk.WrapSDKContext(ctx) msgs := createNAuction(keeper, ctx, 2) for _, tc := range []struct { @@ -70,7 +70,7 @@ func TestAuctionQuerySingle(t *testing.T) { } func TestAuctionQueryPaginated(t *testing.T) { - keeper, ctx := keepertest.CosmostestKeeper(t) + keeper, ctx := keepertest.ColinearcoreKeeper(t) wctx := sdk.WrapSDKContext(ctx) msgs := createNAuction(keeper, ctx, 5) diff --git a/x/cosmostest/keeper/grpc_query_next_auction.go b/x/colinear-core/keeper/grpc_query_next_auction.go similarity index 94% rename from x/cosmostest/keeper/grpc_query_next_auction.go rename to x/colinear-core/keeper/grpc_query_next_auction.go index ba739a3..0429444 100644 --- a/x/cosmostest/keeper/grpc_query_next_auction.go +++ b/x/colinear-core/keeper/grpc_query_next_auction.go @@ -3,7 +3,8 @@ package keeper import ( "context" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" + sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/x/cosmostest/keeper/grpc_query_next_auction_test.go b/x/colinear-core/keeper/grpc_query_next_auction_test.go similarity index 86% rename from x/cosmostest/keeper/grpc_query_next_auction_test.go rename to x/colinear-core/keeper/grpc_query_next_auction_test.go index ee36d30..d5f8ce1 100644 --- a/x/cosmostest/keeper/grpc_query_next_auction_test.go +++ b/x/colinear-core/keeper/grpc_query_next_auction_test.go @@ -8,13 +8,13 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - keepertest "cosmos-test/testutil/keeper" - "cosmos-test/testutil/nullify" - "cosmos-test/x/cosmostest/types" + keepertest "colinear/testutil/keeper" + "colinear/testutil/nullify" + "colinear/x/colinear-core/types" ) func TestNextAuctionQuery(t *testing.T) { - keeper, ctx := keepertest.CosmostestKeeper(t) + keeper, ctx := keepertest.ColinearcoreKeeper(t) wctx := sdk.WrapSDKContext(ctx) item := createTestNextAuction(keeper, ctx) for _, tc := range []struct { diff --git a/x/cosmostest/keeper/grpc_query_params.go b/x/colinear-core/keeper/grpc_query_params.go similarity index 92% rename from x/cosmostest/keeper/grpc_query_params.go rename to x/colinear-core/keeper/grpc_query_params.go index 32c06a7..7f3daf3 100644 --- a/x/cosmostest/keeper/grpc_query_params.go +++ b/x/colinear-core/keeper/grpc_query_params.go @@ -3,7 +3,7 @@ package keeper import ( "context" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" sdk "github.com/cosmos/cosmos-sdk/types" "google.golang.org/grpc/codes" diff --git a/x/cosmostest/keeper/grpc_query_params_test.go b/x/colinear-core/keeper/grpc_query_params_test.go similarity index 77% rename from x/cosmostest/keeper/grpc_query_params_test.go rename to x/colinear-core/keeper/grpc_query_params_test.go index abd0c4f..064670b 100644 --- a/x/cosmostest/keeper/grpc_query_params_test.go +++ b/x/colinear-core/keeper/grpc_query_params_test.go @@ -3,14 +3,15 @@ package keeper_test import ( "testing" - testkeeper "cosmos-test/testutil/keeper" - "cosmos-test/x/cosmostest/types" + testkeeper "colinear/testutil/keeper" + "colinear/x/colinear-core/types" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" ) func TestParamsQuery(t *testing.T) { - keeper, ctx := testkeeper.CosmostestKeeper(t) + keeper, ctx := testkeeper.ColinearcoreKeeper(t) wctx := sdk.WrapSDKContext(ctx) params := types.DefaultParams() keeper.SetParams(ctx, params) diff --git a/x/cosmostest/keeper/keeper.go b/x/colinear-core/keeper/keeper.go similarity index 96% rename from x/cosmostest/keeper/keeper.go rename to x/colinear-core/keeper/keeper.go index c6f3955..d1d15de 100644 --- a/x/cosmostest/keeper/keeper.go +++ b/x/colinear-core/keeper/keeper.go @@ -5,7 +5,7 @@ import ( "github.com/tendermint/tendermint/libs/log" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/cosmostest/keeper/keeper_integration_test.go.bak b/x/colinear-core/keeper/keeper_integration_test.go.bak similarity index 91% rename from x/cosmostest/keeper/keeper_integration_test.go.bak rename to x/colinear-core/keeper/keeper_integration_test.go.bak index 325c403..7c35c28 100644 --- a/x/cosmostest/keeper/keeper_integration_test.go.bak +++ b/x/colinear-core/keeper/keeper_integration_test.go.bak @@ -3,8 +3,8 @@ package keeper import ( - "cosmos-test/x/cosmostest" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core" + "colinear/x/colinear-core/types" "testing" "time" @@ -26,14 +26,14 @@ import ( type IntegrationTestSuite struct { suite.Suite - app cosmostest.AppModule + app colinear.AppModule msgServer types.MsgServer ctx sdk.Context queryClient types.QueryClient } func (suite *IntegrationTestSuite) SetupTest() { - suite.app = cosmostest.AppModule{ + suite.app = colinear.AppModule{ Keeper: NewKeeper(cdc) } suite.ctx = suite.app.NewContext(false, tendermintTypes.Header{Time: time.Now()}) diff --git a/x/cosmostest/keeper/msg_server.go b/x/colinear-core/keeper/msg_server.go similarity index 89% rename from x/cosmostest/keeper/msg_server.go rename to x/colinear-core/keeper/msg_server.go index 8594eab..2a4e87b 100644 --- a/x/cosmostest/keeper/msg_server.go +++ b/x/colinear-core/keeper/msg_server.go @@ -1,7 +1,7 @@ package keeper import ( - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" ) type msgServer struct { diff --git a/x/cosmostest/keeper/msg_server_new_auction.go b/x/colinear-core/keeper/msg_server_new_auction.go similarity index 96% rename from x/cosmostest/keeper/msg_server_new_auction.go rename to x/colinear-core/keeper/msg_server_new_auction.go index beae755..2653605 100644 --- a/x/cosmostest/keeper/msg_server_new_auction.go +++ b/x/colinear-core/keeper/msg_server_new_auction.go @@ -7,8 +7,8 @@ import ( "math/big" "strconv" - "cosmos-test/x/cosmostest/auctionconfig" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/auctionconfig" + "colinear/x/colinear-core/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/cosmostest/keeper/msg_server_new_bid.go b/x/colinear-core/keeper/msg_server_new_bid.go similarity index 96% rename from x/cosmostest/keeper/msg_server_new_bid.go rename to x/colinear-core/keeper/msg_server_new_bid.go index b86aa26..60e98b3 100644 --- a/x/cosmostest/keeper/msg_server_new_bid.go +++ b/x/colinear-core/keeper/msg_server_new_bid.go @@ -6,8 +6,8 @@ import ( "math/big" "reflect" - "cosmos-test/x/cosmostest/memdb" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/memdb" + "colinear/x/colinear-core/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/cosmostest/keeper/msg_server_test.go b/x/colinear-core/keeper/msg_server_test.go similarity index 60% rename from x/cosmostest/keeper/msg_server_test.go rename to x/colinear-core/keeper/msg_server_test.go index dd4f23e..2d82b82 100644 --- a/x/cosmostest/keeper/msg_server_test.go +++ b/x/colinear-core/keeper/msg_server_test.go @@ -4,13 +4,14 @@ import ( "context" "testing" - keepertest "cosmos-test/testutil/keeper" - "cosmos-test/x/cosmostest/keeper" - "cosmos-test/x/cosmostest/types" + keepertest "colinear/testutil/keeper" + "colinear/x/colinear-core/keeper" + "colinear/x/colinear-core/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { - k, ctx := keepertest.CosmostestKeeper(t) + k, ctx := keepertest.ColinearcoreKeeper(t) return keeper.NewMsgServerImpl(*k), sdk.WrapSDKContext(ctx) } diff --git a/x/cosmostest/keeper/next_auction.go b/x/colinear-core/keeper/next_auction.go similarity index 96% rename from x/cosmostest/keeper/next_auction.go rename to x/colinear-core/keeper/next_auction.go index c21c153..2aebbf9 100644 --- a/x/cosmostest/keeper/next_auction.go +++ b/x/colinear-core/keeper/next_auction.go @@ -1,7 +1,8 @@ package keeper import ( - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" + "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/cosmostest/keeper/next_auction_test.go b/x/colinear-core/keeper/next_auction_test.go similarity index 74% rename from x/cosmostest/keeper/next_auction_test.go rename to x/colinear-core/keeper/next_auction_test.go index f31ba96..c273110 100644 --- a/x/cosmostest/keeper/next_auction_test.go +++ b/x/colinear-core/keeper/next_auction_test.go @@ -6,10 +6,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/require" - keepertest "cosmos-test/testutil/keeper" - "cosmos-test/testutil/nullify" - "cosmos-test/x/cosmostest/keeper" - "cosmos-test/x/cosmostest/types" + keepertest "colinear/testutil/keeper" + "colinear/testutil/nullify" + "colinear/x/colinear-core/keeper" + "colinear/x/colinear-core/types" ) func createTestNextAuction(keeper *keeper.Keeper, ctx sdk.Context) types.NextAuction { @@ -19,7 +19,7 @@ func createTestNextAuction(keeper *keeper.Keeper, ctx sdk.Context) types.NextAuc } func TestNextAuctionGet(t *testing.T) { - keeper, ctx := keepertest.CosmostestKeeper(t) + keeper, ctx := keepertest.ColinearcoreKeeper(t) item := createTestNextAuction(keeper, ctx) rst, found := keeper.GetNextAuction(ctx) require.True(t, found) @@ -30,7 +30,7 @@ func TestNextAuctionGet(t *testing.T) { } func TestNextAuctionRemove(t *testing.T) { - keeper, ctx := keepertest.CosmostestKeeper(t) + keeper, ctx := keepertest.ColinearcoreKeeper(t) createTestNextAuction(keeper, ctx) keeper.RemoveNextAuction(ctx) _, found := keeper.GetNextAuction(ctx) diff --git a/x/cosmostest/keeper/params.go b/x/colinear-core/keeper/params.go similarity index 90% rename from x/cosmostest/keeper/params.go rename to x/colinear-core/keeper/params.go index a39112b..42cf259 100644 --- a/x/cosmostest/keeper/params.go +++ b/x/colinear-core/keeper/params.go @@ -1,7 +1,8 @@ package keeper import ( - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" + sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/cosmostest/keeper/params_test.go b/x/colinear-core/keeper/params_test.go similarity index 66% rename from x/cosmostest/keeper/params_test.go rename to x/colinear-core/keeper/params_test.go index c162346..288e1f3 100644 --- a/x/cosmostest/keeper/params_test.go +++ b/x/colinear-core/keeper/params_test.go @@ -3,13 +3,14 @@ package keeper_test import ( "testing" - testkeeper "cosmos-test/testutil/keeper" - "cosmos-test/x/cosmostest/types" + testkeeper "colinear/testutil/keeper" + "colinear/x/colinear-core/types" + "github.com/stretchr/testify/require" ) func TestGetParams(t *testing.T) { - k, ctx := testkeeper.CosmostestKeeper(t) + k, ctx := testkeeper.ColinearcoreKeeper(t) params := types.DefaultParams() k.SetParams(ctx, params) diff --git a/x/cosmostest/math/vesting.go b/x/colinear-core/math/vesting.go similarity index 100% rename from x/cosmostest/math/vesting.go rename to x/colinear-core/math/vesting.go diff --git a/x/cosmostest/math/vesting_test.go b/x/colinear-core/math/vesting_test.go similarity index 100% rename from x/cosmostest/math/vesting_test.go rename to x/colinear-core/math/vesting_test.go diff --git a/x/cosmostest/memdb/README.md b/x/colinear-core/memdb/README.md similarity index 100% rename from x/cosmostest/memdb/README.md rename to x/colinear-core/memdb/README.md diff --git a/x/cosmostest/memdb/biddb.go b/x/colinear-core/memdb/biddb.go similarity index 97% rename from x/cosmostest/memdb/biddb.go rename to x/colinear-core/memdb/biddb.go index fbde0c9..b0707db 100644 --- a/x/cosmostest/memdb/biddb.go +++ b/x/colinear-core/memdb/biddb.go @@ -2,13 +2,13 @@ package memdb import ( "bytes" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" "encoding/gob" "errors" "log" "math/big" - "github.com/dgraph-io/badger/v3" + badger "github.com/dgraph-io/badger/v3" ) type bidDB struct { diff --git a/x/cosmostest/memdb/biddb_test.go b/x/colinear-core/memdb/biddb_test.go similarity index 97% rename from x/cosmostest/memdb/biddb_test.go rename to x/colinear-core/memdb/biddb_test.go index 5ec9ed3..d12920d 100644 --- a/x/cosmostest/memdb/biddb_test.go +++ b/x/colinear-core/memdb/biddb_test.go @@ -1,7 +1,7 @@ package memdb import ( - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" "fmt" "testing" diff --git a/x/cosmostest/module.go b/x/colinear-core/module.go similarity index 97% rename from x/cosmostest/module.go rename to x/colinear-core/module.go index 2bf34a1..3456ed7 100644 --- a/x/cosmostest/module.go +++ b/x/colinear-core/module.go @@ -1,4 +1,4 @@ -package cosmostest +package colinearcore import ( "context" @@ -11,10 +11,10 @@ import ( abci "github.com/tendermint/tendermint/abci/types" - "cosmos-test/x/cosmostest/client/cli" - "cosmos-test/x/cosmostest/keeper" - "cosmos-test/x/cosmostest/memdb" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/client/cli" + "colinear/x/colinear-core/keeper" + "colinear/x/colinear-core/memdb" + "colinear/x/colinear-core/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/cosmostest/module_simulation.go b/x/colinear-core/module_simulation.go similarity index 86% rename from x/cosmostest/module_simulation.go rename to x/colinear-core/module_simulation.go index 0996dc0..236353e 100644 --- a/x/cosmostest/module_simulation.go +++ b/x/colinear-core/module_simulation.go @@ -1,11 +1,12 @@ -package cosmostest +package colinearcore import ( "math/rand" - "cosmos-test/testutil/sample" - cosmostestsimulation "cosmos-test/x/cosmostest/simulation" - "cosmos-test/x/cosmostest/types" + "colinear/testutil/sample" + colinearsimulation "colinear/x/colinear-core/simulation" + "colinear/x/colinear-core/types" + "github.com/cosmos/cosmos-sdk/baseapp" simappparams "github.com/cosmos/cosmos-sdk/simapp/params" sdk "github.com/cosmos/cosmos-sdk/types" @@ -17,7 +18,7 @@ import ( // avoid unused import issue var ( _ = sample.AccAddress - _ = cosmostestsimulation.FindAccount + _ = colinearsimulation.FindAccount _ = simappparams.StakePerAccount _ = simulation.MsgEntryKind _ = baseapp.Paramspace @@ -41,11 +42,11 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { for i, acc := range simState.Accounts { accs[i] = acc.Address.String() } - cosmostestGenesis := types.GenesisState{ + colinearGenesis := types.GenesisState{ Params: types.DefaultParams(), // this line is used by starport scaffolding # simapp/module/genesisState } - simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(&cosmostestGenesis) + simState.GenState[types.ModuleName] = simState.Cdc.MustMarshalJSON(&colinearGenesis) } // ProposalContents doesn't return any content functions for governance proposals @@ -74,7 +75,7 @@ func (am AppModule) WeightedOperations(simState module.SimulationState) []simtyp ) operations = append(operations, simulation.NewWeightedOperation( weightMsgNewAuction, - cosmostestsimulation.SimulateMsgNewAuction(am.accountKeeper, am.bankKeeper, am.keeper), + colinearsimulation.SimulateMsgNewAuction(am.accountKeeper, am.bankKeeper, am.keeper), )) var weightMsgNewBid int @@ -85,7 +86,7 @@ func (am AppModule) WeightedOperations(simState module.SimulationState) []simtyp ) operations = append(operations, simulation.NewWeightedOperation( weightMsgNewBid, - cosmostestsimulation.SimulateMsgNewBid(am.accountKeeper, am.bankKeeper, am.keeper), + colinearsimulation.SimulateMsgNewBid(am.accountKeeper, am.bankKeeper, am.keeper), )) // this line is used by starport scaffolding # simapp/module/operation diff --git a/x/cosmostest/module_test.go.bak b/x/colinear-core/module_test.go.bak similarity index 95% rename from x/cosmostest/module_test.go.bak rename to x/colinear-core/module_test.go.bak index e48b470..277e1a0 100644 --- a/x/cosmostest/module_test.go.bak +++ b/x/colinear-core/module_test.go.bak @@ -1,7 +1,7 @@ -package cosmostest +package colinearcore import ( - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" "testing" "time" diff --git a/x/cosmostest/simulation/new_auction.go b/x/colinear-core/simulation/new_auction.go similarity index 91% rename from x/cosmostest/simulation/new_auction.go rename to x/colinear-core/simulation/new_auction.go index d62ff39..6dc53da 100644 --- a/x/cosmostest/simulation/new_auction.go +++ b/x/colinear-core/simulation/new_auction.go @@ -3,8 +3,9 @@ package simulation import ( "math/rand" - "cosmos-test/x/cosmostest/keeper" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/keeper" + "colinear/x/colinear-core/types" + "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" diff --git a/x/cosmostest/simulation/new_bid.go b/x/colinear-core/simulation/new_bid.go similarity index 91% rename from x/cosmostest/simulation/new_bid.go rename to x/colinear-core/simulation/new_bid.go index e3289e0..541fdff 100644 --- a/x/cosmostest/simulation/new_bid.go +++ b/x/colinear-core/simulation/new_bid.go @@ -3,8 +3,9 @@ package simulation import ( "math/rand" - "cosmos-test/x/cosmostest/keeper" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/keeper" + "colinear/x/colinear-core/types" + "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" diff --git a/x/cosmostest/simulation/simap.go b/x/colinear-core/simulation/simap.go similarity index 100% rename from x/cosmostest/simulation/simap.go rename to x/colinear-core/simulation/simap.go diff --git a/x/cosmostest/types/auction.pb.go b/x/colinear-core/types/auction.pb.go similarity index 98% rename from x/cosmostest/types/auction.pb.go rename to x/colinear-core/types/auction.pb.go index f8b87af..92a4add 100644 --- a/x/cosmostest/types/auction.pb.go +++ b/x/colinear-core/types/auction.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cosmostest/auction.proto +// source: colinear/auction.proto package types @@ -147,10 +147,10 @@ func (m *Auction) GetRemaining() string { } func init() { - proto.RegisterType((*Auction)(nil), "cosmostest.cosmostest.Auction") + proto.RegisterType((*Auction)(nil), "colinear.colinear.Auction") } -func init() { proto.RegisterFile("cosmostest/auction.proto", fileDescriptor_631f6f59914101d9) } +func init() { proto.RegisterFile("colinear/auction.proto", fileDescriptor_631f6f59914101d9) } var fileDescriptor_631f6f59914101d9 = []byte{ // 298 bytes of a gzipped FileDescriptorProto diff --git a/x/cosmostest/types/bid.pb.go b/x/colinear-core/types/bid.pb.go similarity index 97% rename from x/cosmostest/types/bid.pb.go rename to x/colinear-core/types/bid.pb.go index 910881f..b4597ef 100644 --- a/x/cosmostest/types/bid.pb.go +++ b/x/colinear-core/types/bid.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cosmostest/bid.proto +// source: colinear/bid.proto package types @@ -75,10 +75,10 @@ func (m *Bid) GetAmount() string { } func init() { - proto.RegisterType((*Bid)(nil), "cosmostest.cosmostest.Bid") + proto.RegisterType((*Bid)(nil), "colinear.colinear.Bid") } -func init() { proto.RegisterFile("cosmostest/bid.proto", fileDescriptor_74e391fc4965aac8) } +func init() { proto.RegisterFile("colinear/bid.proto", fileDescriptor_74e391fc4965aac8) } var fileDescriptor_74e391fc4965aac8 = []byte{ // 142 bytes of a gzipped FileDescriptorProto diff --git a/x/cosmostest/types/codec.go b/x/colinear-core/types/codec.go similarity index 84% rename from x/cosmostest/types/codec.go rename to x/colinear-core/types/codec.go index a6f3a8b..922449e 100644 --- a/x/cosmostest/types/codec.go +++ b/x/colinear-core/types/codec.go @@ -8,8 +8,8 @@ import ( ) func RegisterCodec(cdc *codec.LegacyAmino) { - cdc.RegisterConcrete(&MsgNewAuction{}, "cosmostest/NewAuction", nil) - cdc.RegisterConcrete(&MsgNewBid{}, "cosmostest/NewBid", nil) + cdc.RegisterConcrete(&MsgNewAuction{}, "colinear/NewAuction", nil) + cdc.RegisterConcrete(&MsgNewBid{}, "colinear/NewBid", nil) // this line is used by starport scaffolding # 2 } diff --git a/x/cosmostest/types/errors.go b/x/colinear-core/types/errors.go similarity index 80% rename from x/cosmostest/types/errors.go rename to x/colinear-core/types/errors.go index d879d6b..138ca63 100644 --- a/x/cosmostest/types/errors.go +++ b/x/colinear-core/types/errors.go @@ -6,7 +6,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) -// x/cosmostest module sentinel errors +// x/colinear-core module sentinel errors var ( ErrSample = sdkerrors.Register(ModuleName, 1100, "sample error") ) diff --git a/x/cosmostest/types/expected_keepers.go b/x/colinear-core/types/expected_keepers.go similarity index 100% rename from x/cosmostest/types/expected_keepers.go rename to x/colinear-core/types/expected_keepers.go diff --git a/x/cosmostest/types/genesis.go b/x/colinear-core/types/genesis.go similarity index 100% rename from x/cosmostest/types/genesis.go rename to x/colinear-core/types/genesis.go diff --git a/x/cosmostest/types/genesis.pb.go b/x/colinear-core/types/genesis.pb.go similarity index 97% rename from x/cosmostest/types/genesis.pb.go rename to x/colinear-core/types/genesis.pb.go index 12c765e..b49a7d0 100644 --- a/x/cosmostest/types/genesis.pb.go +++ b/x/colinear-core/types/genesis.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cosmostest/genesis.proto +// source: colinear/genesis.proto package types @@ -23,7 +23,7 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -// GenesisState defines the cosmostest module's genesis state. +// GenesisState defines the colinear module's genesis state. type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` NextAuction *NextAuction `protobuf:"bytes,2,opt,name=nextAuction,proto3" json:"nextAuction,omitempty"` @@ -85,10 +85,10 @@ func (m *GenesisState) GetAuctionList() []Auction { } func init() { - proto.RegisterType((*GenesisState)(nil), "cosmostest.cosmostest.GenesisState") + proto.RegisterType((*GenesisState)(nil), "colinear.colinear.GenesisState") } -func init() { proto.RegisterFile("cosmostest/genesis.proto", fileDescriptor_78c0d8c25fe3d9a9) } +func init() { proto.RegisterFile("colinear/genesis.proto", fileDescriptor_78c0d8c25fe3d9a9) } var fileDescriptor_78c0d8c25fe3d9a9 = []byte{ // 247 bytes of a gzipped FileDescriptorProto diff --git a/x/cosmostest/types/genesis_test.go b/x/colinear-core/types/genesis_test.go similarity index 96% rename from x/cosmostest/types/genesis_test.go rename to x/colinear-core/types/genesis_test.go index 4695ee0..59b0dfa 100644 --- a/x/cosmostest/types/genesis_test.go +++ b/x/colinear-core/types/genesis_test.go @@ -3,7 +3,8 @@ package types_test import ( "testing" - "cosmos-test/x/cosmostest/types" + "colinear/x/colinear-core/types" + "github.com/stretchr/testify/require" ) diff --git a/x/cosmostest/types/key_auction.go b/x/colinear-core/types/key_auction.go similarity index 100% rename from x/cosmostest/types/key_auction.go rename to x/colinear-core/types/key_auction.go diff --git a/x/cosmostest/types/keys.go b/x/colinear-core/types/keys.go similarity index 88% rename from x/cosmostest/types/keys.go rename to x/colinear-core/types/keys.go index c8bcc19..095f430 100644 --- a/x/cosmostest/types/keys.go +++ b/x/colinear-core/types/keys.go @@ -2,7 +2,7 @@ package types const ( // ModuleName defines the module name - ModuleName = "cosmostest" + ModuleName = "colinear" // StoreKey defines the primary module store key StoreKey = ModuleName @@ -14,7 +14,7 @@ const ( QuerierRoute = ModuleName // MemStoreKey defines the in-memory store key - MemStoreKey = "mem_cosmostest" + MemStoreKey = "mem_colinear" ) func KeyPrefix(p string) []byte { diff --git a/x/cosmostest/types/message_new_auction.go b/x/colinear-core/types/message_new_auction.go similarity index 100% rename from x/cosmostest/types/message_new_auction.go rename to x/colinear-core/types/message_new_auction.go diff --git a/x/cosmostest/types/message_new_auction_test.go b/x/colinear-core/types/message_new_auction_test.go similarity index 95% rename from x/cosmostest/types/message_new_auction_test.go rename to x/colinear-core/types/message_new_auction_test.go index d624ef2..6f92985 100644 --- a/x/cosmostest/types/message_new_auction_test.go +++ b/x/colinear-core/types/message_new_auction_test.go @@ -3,7 +3,8 @@ package types import ( "testing" - "cosmos-test/testutil/sample" + "colinear/testutil/sample" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) diff --git a/x/cosmostest/types/message_new_bid.go b/x/colinear-core/types/message_new_bid.go similarity index 100% rename from x/cosmostest/types/message_new_bid.go rename to x/colinear-core/types/message_new_bid.go diff --git a/x/cosmostest/types/message_new_bid_test.go b/x/colinear-core/types/message_new_bid_test.go similarity index 95% rename from x/cosmostest/types/message_new_bid_test.go rename to x/colinear-core/types/message_new_bid_test.go index 2226ddb..459f889 100644 --- a/x/cosmostest/types/message_new_bid_test.go +++ b/x/colinear-core/types/message_new_bid_test.go @@ -3,7 +3,8 @@ package types import ( "testing" - "cosmos-test/testutil/sample" + "colinear/testutil/sample" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/stretchr/testify/require" ) diff --git a/x/cosmostest/types/next_auction.pb.go b/x/colinear-core/types/next_auction.pb.go similarity index 97% rename from x/cosmostest/types/next_auction.pb.go rename to x/colinear-core/types/next_auction.pb.go index d2161be..c790b15 100644 --- a/x/cosmostest/types/next_auction.pb.go +++ b/x/colinear-core/types/next_auction.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cosmostest/next_auction.proto +// source: colinear/next_auction.proto package types @@ -67,10 +67,10 @@ func (m *NextAuction) GetAuctionId() uint64 { } func init() { - proto.RegisterType((*NextAuction)(nil), "cosmostest.cosmostest.NextAuction") + proto.RegisterType((*NextAuction)(nil), "colinear.colinear.NextAuction") } -func init() { proto.RegisterFile("cosmostest/next_auction.proto", fileDescriptor_403ab8ae798c785d) } +func init() { proto.RegisterFile("colinear/next_auction.proto", fileDescriptor_403ab8ae798c785d) } var fileDescriptor_403ab8ae798c785d = []byte{ // 139 bytes of a gzipped FileDescriptorProto diff --git a/x/cosmostest/types/params.go b/x/colinear-core/types/params.go similarity index 100% rename from x/cosmostest/types/params.go rename to x/colinear-core/types/params.go diff --git a/x/cosmostest/types/params.pb.go b/x/colinear-core/types/params.pb.go similarity index 96% rename from x/cosmostest/types/params.pb.go rename to x/colinear-core/types/params.pb.go index 794745b..bccd20f 100644 --- a/x/cosmostest/types/params.pb.go +++ b/x/colinear-core/types/params.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cosmostest/params.proto +// source: colinear/params.proto package types @@ -60,10 +60,10 @@ func (m *Params) XXX_DiscardUnknown() { var xxx_messageInfo_Params proto.InternalMessageInfo func init() { - proto.RegisterType((*Params)(nil), "cosmostest.cosmostest.Params") + proto.RegisterType((*Params)(nil), "colinear.colinear.Params") } -func init() { proto.RegisterFile("cosmostest/params.proto", fileDescriptor_dec10d5375a626c5) } +func init() { proto.RegisterFile("colinear/params.proto", fileDescriptor_dec10d5375a626c5) } var fileDescriptor_dec10d5375a626c5 = []byte{ // 131 bytes of a gzipped FileDescriptorProto diff --git a/x/cosmostest/types/query.pb.go b/x/colinear-core/types/query.pb.go similarity index 96% rename from x/cosmostest/types/query.pb.go rename to x/colinear-core/types/query.pb.go index 94b7f82..14619d6 100644 --- a/x/cosmostest/types/query.pb.go +++ b/x/colinear-core/types/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cosmostest/query.proto +// source: colinear/query.proto package types @@ -466,19 +466,19 @@ func (m *QueryAuctionBidsResponse) GetBids() []*Bid { } func init() { - proto.RegisterType((*QueryParamsRequest)(nil), "cosmostest.cosmostest.QueryParamsRequest") - proto.RegisterType((*QueryParamsResponse)(nil), "cosmostest.cosmostest.QueryParamsResponse") - proto.RegisterType((*QueryGetNextAuctionRequest)(nil), "cosmostest.cosmostest.QueryGetNextAuctionRequest") - proto.RegisterType((*QueryGetNextAuctionResponse)(nil), "cosmostest.cosmostest.QueryGetNextAuctionResponse") - proto.RegisterType((*QueryGetAuctionRequest)(nil), "cosmostest.cosmostest.QueryGetAuctionRequest") - proto.RegisterType((*QueryGetAuctionResponse)(nil), "cosmostest.cosmostest.QueryGetAuctionResponse") - proto.RegisterType((*QueryAllAuctionRequest)(nil), "cosmostest.cosmostest.QueryAllAuctionRequest") - proto.RegisterType((*QueryAllAuctionResponse)(nil), "cosmostest.cosmostest.QueryAllAuctionResponse") - proto.RegisterType((*QueryAuctionBidsRequest)(nil), "cosmostest.cosmostest.QueryAuctionBidsRequest") - proto.RegisterType((*QueryAuctionBidsResponse)(nil), "cosmostest.cosmostest.QueryAuctionBidsResponse") + proto.RegisterType((*QueryParamsRequest)(nil), "colinear.colinear.QueryParamsRequest") + proto.RegisterType((*QueryParamsResponse)(nil), "colinear.colinear.QueryParamsResponse") + proto.RegisterType((*QueryGetNextAuctionRequest)(nil), "colinear.colinear.QueryGetNextAuctionRequest") + proto.RegisterType((*QueryGetNextAuctionResponse)(nil), "colinear.colinear.QueryGetNextAuctionResponse") + proto.RegisterType((*QueryGetAuctionRequest)(nil), "colinear.colinear.QueryGetAuctionRequest") + proto.RegisterType((*QueryGetAuctionResponse)(nil), "colinear.colinear.QueryGetAuctionResponse") + proto.RegisterType((*QueryAllAuctionRequest)(nil), "colinear.colinear.QueryAllAuctionRequest") + proto.RegisterType((*QueryAllAuctionResponse)(nil), "colinear.colinear.QueryAllAuctionResponse") + proto.RegisterType((*QueryAuctionBidsRequest)(nil), "colinear.colinear.QueryAuctionBidsRequest") + proto.RegisterType((*QueryAuctionBidsResponse)(nil), "colinear.colinear.QueryAuctionBidsResponse") } -func init() { proto.RegisterFile("cosmostest/query.proto", fileDescriptor_540d26b2788a5d10) } +func init() { proto.RegisterFile("colinear/query.proto", fileDescriptor_540d26b2788a5d10) } var fileDescriptor_540d26b2788a5d10 = []byte{ // 605 bytes of a gzipped FileDescriptorProto @@ -556,7 +556,7 @@ func NewQueryClient(cc grpc1.ClientConn) QueryClient { func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts ...grpc.CallOption) (*QueryParamsResponse, error) { out := new(QueryParamsResponse) - err := c.cc.Invoke(ctx, "/cosmostest.cosmostest.Query/Params", in, out, opts...) + err := c.cc.Invoke(ctx, "/colinear.colinear.Query/Params", in, out, opts...) if err != nil { return nil, err } @@ -565,7 +565,7 @@ func (c *queryClient) Params(ctx context.Context, in *QueryParamsRequest, opts . func (c *queryClient) NextAuction(ctx context.Context, in *QueryGetNextAuctionRequest, opts ...grpc.CallOption) (*QueryGetNextAuctionResponse, error) { out := new(QueryGetNextAuctionResponse) - err := c.cc.Invoke(ctx, "/cosmostest.cosmostest.Query/NextAuction", in, out, opts...) + err := c.cc.Invoke(ctx, "/colinear.colinear.Query/NextAuction", in, out, opts...) if err != nil { return nil, err } @@ -574,7 +574,7 @@ func (c *queryClient) NextAuction(ctx context.Context, in *QueryGetNextAuctionRe func (c *queryClient) Auction(ctx context.Context, in *QueryGetAuctionRequest, opts ...grpc.CallOption) (*QueryGetAuctionResponse, error) { out := new(QueryGetAuctionResponse) - err := c.cc.Invoke(ctx, "/cosmostest.cosmostest.Query/Auction", in, out, opts...) + err := c.cc.Invoke(ctx, "/colinear.colinear.Query/Auction", in, out, opts...) if err != nil { return nil, err } @@ -583,7 +583,7 @@ func (c *queryClient) Auction(ctx context.Context, in *QueryGetAuctionRequest, o func (c *queryClient) AuctionAll(ctx context.Context, in *QueryAllAuctionRequest, opts ...grpc.CallOption) (*QueryAllAuctionResponse, error) { out := new(QueryAllAuctionResponse) - err := c.cc.Invoke(ctx, "/cosmostest.cosmostest.Query/AuctionAll", in, out, opts...) + err := c.cc.Invoke(ctx, "/colinear.colinear.Query/AuctionAll", in, out, opts...) if err != nil { return nil, err } @@ -592,7 +592,7 @@ func (c *queryClient) AuctionAll(ctx context.Context, in *QueryAllAuctionRequest func (c *queryClient) AuctionBids(ctx context.Context, in *QueryAuctionBidsRequest, opts ...grpc.CallOption) (*QueryAuctionBidsResponse, error) { out := new(QueryAuctionBidsResponse) - err := c.cc.Invoke(ctx, "/cosmostest.cosmostest.Query/AuctionBids", in, out, opts...) + err := c.cc.Invoke(ctx, "/colinear.colinear.Query/AuctionBids", in, out, opts...) if err != nil { return nil, err } @@ -647,7 +647,7 @@ func _Query_Params_Handler(srv interface{}, ctx context.Context, dec func(interf } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmostest.cosmostest.Query/Params", + FullMethod: "/colinear.colinear.Query/Params", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Params(ctx, req.(*QueryParamsRequest)) @@ -665,7 +665,7 @@ func _Query_NextAuction_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmostest.cosmostest.Query/NextAuction", + FullMethod: "/colinear.colinear.Query/NextAuction", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).NextAuction(ctx, req.(*QueryGetNextAuctionRequest)) @@ -683,7 +683,7 @@ func _Query_Auction_Handler(srv interface{}, ctx context.Context, dec func(inter } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmostest.cosmostest.Query/Auction", + FullMethod: "/colinear.colinear.Query/Auction", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).Auction(ctx, req.(*QueryGetAuctionRequest)) @@ -701,7 +701,7 @@ func _Query_AuctionAll_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmostest.cosmostest.Query/AuctionAll", + FullMethod: "/colinear.colinear.Query/AuctionAll", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).AuctionAll(ctx, req.(*QueryAllAuctionRequest)) @@ -719,7 +719,7 @@ func _Query_AuctionBids_Handler(srv interface{}, ctx context.Context, dec func(i } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmostest.cosmostest.Query/AuctionBids", + FullMethod: "/colinear.colinear.Query/AuctionBids", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(QueryServer).AuctionBids(ctx, req.(*QueryAuctionBidsRequest)) @@ -728,7 +728,7 @@ func _Query_AuctionBids_Handler(srv interface{}, ctx context.Context, dec func(i } var _Query_serviceDesc = grpc.ServiceDesc{ - ServiceName: "cosmostest.cosmostest.Query", + ServiceName: "colinear.colinear.Query", HandlerType: (*QueryServer)(nil), Methods: []grpc.MethodDesc{ { @@ -753,7 +753,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "cosmostest/query.proto", + Metadata: "colinear/query.proto", } func (m *QueryParamsRequest) Marshal() (dAtA []byte, err error) { diff --git a/x/cosmostest/types/query.pb.gw.go b/x/colinear-core/types/query.pb.gw.go similarity index 96% rename from x/cosmostest/types/query.pb.gw.go rename to x/colinear-core/types/query.pb.gw.go index 511d6b6..a8ea1d7 100644 --- a/x/cosmostest/types/query.pb.gw.go +++ b/x/colinear-core/types/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: cosmostest/query.proto +// source: colinear/query.proto /* Package types is a reverse proxy. @@ -479,15 +479,15 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"cosmos-test", "cosmostest", "params"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Params_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"colinear", "colinear", "params"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_NextAuction_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"cosmos-test", "cosmostest", "next_auction"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_NextAuction_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"colinear", "colinear", "next_auction"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_Auction_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"cosmos-test", "cosmostest", "auction", "index"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_Auction_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"colinear", "colinear", "auction", "index"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_AuctionAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"cosmos-test", "cosmostest", "auction"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_AuctionAll_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"colinear", "colinear", "auction"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Query_AuctionBids_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"cosmos-test", "cosmostest", "auction_bids", "index"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Query_AuctionBids_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"colinear", "colinear", "auction_bids", "index"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( diff --git a/x/cosmostest/types/tx.pb.go b/x/colinear-core/types/tx.pb.go similarity index 97% rename from x/cosmostest/types/tx.pb.go rename to x/colinear-core/types/tx.pb.go index 544a290..8c7f9fb 100644 --- a/x/cosmostest/types/tx.pb.go +++ b/x/colinear-core/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cosmostest/tx.proto +// source: colinear/tx.proto package types @@ -252,13 +252,13 @@ func (m *MsgNewBidResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgNewBidResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgNewAuction)(nil), "cosmostest.cosmostest.MsgNewAuction") - proto.RegisterType((*MsgNewAuctionResponse)(nil), "cosmostest.cosmostest.MsgNewAuctionResponse") - proto.RegisterType((*MsgNewBid)(nil), "cosmostest.cosmostest.MsgNewBid") - proto.RegisterType((*MsgNewBidResponse)(nil), "cosmostest.cosmostest.MsgNewBidResponse") + proto.RegisterType((*MsgNewAuction)(nil), "colinear.colinear.MsgNewAuction") + proto.RegisterType((*MsgNewAuctionResponse)(nil), "colinear.colinear.MsgNewAuctionResponse") + proto.RegisterType((*MsgNewBid)(nil), "colinear.colinear.MsgNewBid") + proto.RegisterType((*MsgNewBidResponse)(nil), "colinear.colinear.MsgNewBidResponse") } -func init() { proto.RegisterFile("cosmostest/tx.proto", fileDescriptor_2fcd5aa4ac15d93c) } +func init() { proto.RegisterFile("colinear/tx.proto", fileDescriptor_2fcd5aa4ac15d93c) } var fileDescriptor_2fcd5aa4ac15d93c = []byte{ // 338 bytes of a gzipped FileDescriptorProto @@ -312,7 +312,7 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { func (c *msgClient) NewAuction(ctx context.Context, in *MsgNewAuction, opts ...grpc.CallOption) (*MsgNewAuctionResponse, error) { out := new(MsgNewAuctionResponse) - err := c.cc.Invoke(ctx, "/cosmostest.cosmostest.Msg/NewAuction", in, out, opts...) + err := c.cc.Invoke(ctx, "/colinear.colinear.Msg/NewAuction", in, out, opts...) if err != nil { return nil, err } @@ -321,7 +321,7 @@ func (c *msgClient) NewAuction(ctx context.Context, in *MsgNewAuction, opts ...g func (c *msgClient) NewBid(ctx context.Context, in *MsgNewBid, opts ...grpc.CallOption) (*MsgNewBidResponse, error) { out := new(MsgNewBidResponse) - err := c.cc.Invoke(ctx, "/cosmostest.cosmostest.Msg/NewBid", in, out, opts...) + err := c.cc.Invoke(ctx, "/colinear.colinear.Msg/NewBid", in, out, opts...) if err != nil { return nil, err } @@ -359,7 +359,7 @@ func _Msg_NewAuction_Handler(srv interface{}, ctx context.Context, dec func(inte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmostest.cosmostest.Msg/NewAuction", + FullMethod: "/colinear.colinear.Msg/NewAuction", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).NewAuction(ctx, req.(*MsgNewAuction)) @@ -377,7 +377,7 @@ func _Msg_NewBid_Handler(srv interface{}, ctx context.Context, dec func(interfac } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmostest.cosmostest.Msg/NewBid", + FullMethod: "/colinear.colinear.Msg/NewBid", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServer).NewBid(ctx, req.(*MsgNewBid)) @@ -386,7 +386,7 @@ func _Msg_NewBid_Handler(srv interface{}, ctx context.Context, dec func(interfac } var _Msg_serviceDesc = grpc.ServiceDesc{ - ServiceName: "cosmostest.cosmostest.Msg", + ServiceName: "colinear.colinear.Msg", HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { @@ -399,7 +399,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "cosmostest/tx.proto", + Metadata: "colinear/tx.proto", } func (m *MsgNewAuction) Marshal() (dAtA []byte, err error) { diff --git a/x/cosmostest/types/types.go b/x/colinear-core/types/types.go similarity index 100% rename from x/cosmostest/types/types.go rename to x/colinear-core/types/types.go