Remove internal package (#464)

* Move internal subfolders up

* Fix broken imports and fmt

CHANGELOG.md

@@ -1,6 +1,8 @@
 # Changelog
 
 ## [Unreleased](https://github.com/CosmWasm/wasmd/tree/HEAD)
+**Extendability:**
+- Remove `internal` package for better integration [\464](https://github.com/CosmWasm/wasmd/pull/464)
 
 [Full Changelog](https://github.com/CosmWasm/wasmd/compare/v0.15.0...HEAD)
 

contrib/local/00-genesis.sh

@@ -6,7 +6,7 @@ BASE_ACCOUNT=$(wasmd keys show validator -a)
 
 echo "-----------------------"
 echo "## Genesis CosmWasm contract"
-wasmd add-wasm-genesis-message store  "$DIR/../../x/wasm/internal/keeper/testdata/hackatom.wasm" --instantiate-everybody true --builder=foo/bar:latest --run-as validator
+wasmd add-wasm-genesis-message store  "$DIR/../../x/wasm/keeper/testdata/hackatom.wasm" --instantiate-everybody true --builder=foo/bar:latest --run-as validator
 
 echo "-----------------------"
 echo "## Genesis CosmWasm instance"

contrib/local/02-contracts.sh

@@ -5,7 +5,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 
 echo "-----------------------"
 echo "## Add new CosmWasm contract"
-RESP=$(wasmd tx wasm store "$DIR/../../x/wasm/internal/keeper/testdata/hackatom.wasm" \
+RESP=$(wasmd tx wasm store "$DIR/../../x/wasm/keeper/testdata/hackatom.wasm" \
   --from validator --gas 1500000 -y --chain-id=testing --node=http://localhost:26657 -b block)
 
 CODE_ID=$(echo "$RESP" | jq -r '.logs[0].events[0].attributes[-1].value')
@@ -57,7 +57,7 @@ echo "### Query new admin: $(wasmd q wasm contract $CONTRACT -o json | jq -r '.a
 echo "-----------------------"
 echo "## Migrate contract"
 echo "### Upload new code"
-RESP=$(wasmd tx wasm store "$DIR/../../x/wasm/internal/keeper/testdata/burner.wasm" \
+RESP=$(wasmd tx wasm store "$DIR/../../x/wasm/keeper/testdata/burner.wasm" \
   --from validator --gas 1000000 -y --chain-id=testing --node=http://localhost:26657 -b block)
 
 BURNER_CODE_ID=$(echo "$RESP" | jq -r '.logs[0].events[0].attributes[-1].value')

contrib/local/03-grpc-queries.sh

@@ -7,23 +7,23 @@ echo "-----------------------"
 COSMOS_SDK_DIR=${COSMOS_SDK_DIR:-$(go list -f "{{ .Dir }}" -m github.com/cosmos/cosmos-sdk)}
 
 echo "### List all codes"
-RESP=$(grpcurl -plaintext -import-path $COSMOS_SDK_DIR/third_party/proto -import-path $COSMOS_SDK_DIR/proto -import-path . -proto ./x/wasm/internal/types/query.proto \
+RESP=$(grpcurl -plaintext -import-path $COSMOS_SDK_DIR/third_party/proto -import-path $COSMOS_SDK_DIR/proto -import-path . -proto ./x/wasm/types/query.proto \
   localhost:9090  cosmwasm.wasm.v1beta1.Query/Codes)
 echo "$RESP" | jq
 
 CODE_ID=$(echo "$RESP" | jq -r '.codeInfos[-1].codeId')
 echo "### List contract by code"
-RESP=$(grpcurl -plaintext -import-path $COSMOS_SDK_DIR/third_party/proto -import-path $COSMOS_SDK_DIR/proto -import-path . -proto ./x/wasm/internal/types/query.proto \
+RESP=$(grpcurl -plaintext -import-path $COSMOS_SDK_DIR/third_party/proto -import-path $COSMOS_SDK_DIR/proto -import-path . -proto ./x/wasm/types/query.proto \
   -d "{\"codeId\": $CODE_ID}" localhost:9090  cosmwasm.wasm.v1beta1.Query/ContractsByCode )
 echo $RESP | jq
 
 echo "### Show history for contract"
 CONTRACT=$(echo $RESP | jq -r ".contractInfos[-1].address")
-grpcurl -plaintext -import-path $COSMOS_SDK_DIR/third_party/proto -import-path $COSMOS_SDK_DIR/proto -import-path . -proto ./x/wasm/internal/types/query.proto \
+grpcurl -plaintext -import-path $COSMOS_SDK_DIR/third_party/proto -import-path $COSMOS_SDK_DIR/proto -import-path . -proto ./x/wasm/types/query.proto \
   -d "{\"address\": \"$CONTRACT\"}" localhost:9090  cosmwasm.wasm.v1beta1.Query/ContractHistory | jq
 
 echo "### Show contract state"
-grpcurl -plaintext -import-path $COSMOS_SDK_DIR/third_party/proto -import-path $COSMOS_SDK_DIR/proto -import-path . -proto ./x/wasm/internal/types/query.proto \
+grpcurl -plaintext -import-path $COSMOS_SDK_DIR/third_party/proto -import-path $COSMOS_SDK_DIR/proto -import-path . -proto ./x/wasm/types/query.proto \
   -d "{\"address\": \"$CONTRACT\"}" localhost:9090  cosmwasm.wasm.v1beta1.Query/AllContractState | jq
 
 echo "Empty state due to 'burner' contract cleanup"

doc/proto.md

@@ -3,18 +3,18 @@
 
 ## Table of Contents
 
-- [x/wasm/internal/types/genesis.proto](#x/wasm/internal/types/genesis.proto)
+- [x/wasm/types/genesis.proto](#x/wasm/types/genesis.proto)
     - [Code](#cosmwasm.wasm.v1beta1.Code)
     - [Contract](#cosmwasm.wasm.v1beta1.Contract)
     - [GenesisState](#cosmwasm.wasm.v1beta1.GenesisState)
     - [GenesisState.GenMsgs](#cosmwasm.wasm.v1beta1.GenesisState.GenMsgs)
     - [Sequence](#cosmwasm.wasm.v1beta1.Sequence)
 
-- [x/wasm/internal/types/ibc.proto](#x/wasm/internal/types/ibc.proto)
+- [x/wasm/types/ibc.proto](#x/wasm/types/ibc.proto)
     - [MsgIBCCloseChannel](#cosmwasm.wasm.v1beta1.MsgIBCCloseChannel)
     - [MsgIBCSend](#cosmwasm.wasm.v1beta1.MsgIBCSend)
 
-- [x/wasm/internal/types/proposal.proto](#x/wasm/internal/types/proposal.proto)
+- [x/wasm/types/proposal.proto](#x/wasm/types/proposal.proto)
     - [ClearAdminProposal](#cosmwasm.wasm.v1beta1.ClearAdminProposal)
     - [InstantiateContractProposal](#cosmwasm.wasm.v1beta1.InstantiateContractProposal)
     - [MigrateContractProposal](#cosmwasm.wasm.v1beta1.MigrateContractProposal)
@@ -23,7 +23,7 @@
     - [UnpinCodesProposal](#cosmwasm.wasm.v1beta1.UnpinCodesProposal)
     - [UpdateAdminProposal](#cosmwasm.wasm.v1beta1.UpdateAdminProposal)
 
-- [x/wasm/internal/types/query.proto](#x/wasm/internal/types/query.proto)
+- [x/wasm/types/query.proto](#x/wasm/types/query.proto)
     - [CodeInfoResponse](#cosmwasm.wasm.v1beta1.CodeInfoResponse)
     - [ContractInfoWithAddress](#cosmwasm.wasm.v1beta1.ContractInfoWithAddress)
     - [QueryAllContractStateRequest](#cosmwasm.wasm.v1beta1.QueryAllContractStateRequest)
@@ -45,7 +45,7 @@
 
     - [Query](#cosmwasm.wasm.v1beta1.Query)
 
-- [x/wasm/internal/types/tx.proto](#x/wasm/internal/types/tx.proto)
+- [x/wasm/types/tx.proto](#x/wasm/types/tx.proto)
     - [MsgClearAdmin](#cosmwasm.wasm.v1beta1.MsgClearAdmin)
     - [MsgClearAdminResponse](#cosmwasm.wasm.v1beta1.MsgClearAdminResponse)
     - [MsgExecuteContract](#cosmwasm.wasm.v1beta1.MsgExecuteContract)
@@ -61,7 +61,7 @@
 
     - [Msg](#cosmwasm.wasm.v1beta1.Msg)
 
-- [x/wasm/internal/types/types.proto](#x/wasm/internal/types/types.proto)
+- [x/wasm/types/types.proto](#x/wasm/types/types.proto)
     - [AbsoluteTxPosition](#cosmwasm.wasm.v1beta1.AbsoluteTxPosition)
     - [AccessConfig](#cosmwasm.wasm.v1beta1.AccessConfig)
     - [AccessTypeParam](#cosmwasm.wasm.v1beta1.AccessTypeParam)
@@ -78,10 +78,10 @@
 
 
 
-<a name="x/wasm/internal/types/genesis.proto"></a>
+<a name="x/wasm/types/genesis.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## x/wasm/internal/types/genesis.proto
+## x/wasm/types/genesis.proto
 
 
 
@@ -182,10 +182,10 @@ Sequence key and value of an id generation counter
 
 
 
-<a name="x/wasm/internal/types/ibc.proto"></a>
+<a name="x/wasm/types/ibc.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## x/wasm/internal/types/ibc.proto
+## x/wasm/types/ibc.proto
 
 
 
@@ -231,10 +231,10 @@ MsgIBCSend
 
 
 
-<a name="x/wasm/internal/types/proposal.proto"></a>
+<a name="x/wasm/types/proposal.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## x/wasm/internal/types/proposal.proto
+## x/wasm/types/proposal.proto
 
 
 
@@ -379,10 +379,10 @@ UpdateAdminProposal gov proposal content type to set an admin for a contract.
 
 
 
-<a name="x/wasm/internal/types/query.proto"></a>
+<a name="x/wasm/types/query.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## x/wasm/internal/types/query.proto
+## x/wasm/types/query.proto
 
 
 
@@ -698,10 +698,10 @@ Query provides defines the gRPC querier service
 
 
 
-<a name="x/wasm/internal/types/tx.proto"></a>
+<a name="x/wasm/types/tx.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## x/wasm/internal/types/tx.proto
+## x/wasm/types/tx.proto
 
 
 
@@ -918,10 +918,10 @@ Msg defines the wasm Msg service.
 
 
 
-<a name="x/wasm/internal/types/types.proto"></a>
+<a name="x/wasm/types/types.proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## x/wasm/internal/types/types.proto
+## x/wasm/types/types.proto
 
 
 

scripts/protocgen.sh

@@ -2,7 +2,7 @@
 
 set -eo pipefail
 
-PROJECT_PROTO_DIR=x/wasm/internal/types/
+PROJECT_PROTO_DIR=x/wasm/types/
 COSMOS_SDK_DIR=${COSMOS_SDK_DIR:-$(go list -f "{{ .Dir }}" -m github.com/cosmos/cosmos-sdk)}
 
 # Generate Go types from protobuf

x/wasm/Governance.md

@@ -14,22 +14,22 @@ We have added 5 new wasm specific proposal types that cover the contract's live
 * `UpdateAdminProposal` - set a new admin for a contract
 * `ClearAdminProposal` - clear admin for a contract to prevent further migrations
 
-For details see the proposal type [implementation](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/internal/types/proposal.go)
+For details see the proposal type [implementation](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/types/proposal.go)
 
 A wasm message but no proposal type: 
 * `ExecuteContract` - execute a command on a wasm contract
 
 ### Unit tests
-[Proposal type validations](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/internal/types/proposal_test.go)
+[Proposal type validations](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/types/proposal_test.go)
 
 ## Proposal Handler
-The [wasmd proposal_handler](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/internal/keeper/proposal_handler.go) implements the `gov.Handler` function
+The [wasmd proposal_handler](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/keeper/proposal_handler.go) implements the `gov.Handler` function
 and executes the wasmd proposal types after a successful tally.
 
-The proposal handler uses a [`GovAuthorizationPolicy`](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/internal/keeper/authz_policy.go#L29) to bypass the existing contract's authorization policy.
+The proposal handler uses a [`GovAuthorizationPolicy`](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/keeper/authz_policy.go#L29) to bypass the existing contract's authorization policy.
 
 ### Tests
-* [Integration: Submit and execute proposal](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/internal/keeper/proposal_integration_test.go)
+* [Integration: Submit and execute proposal](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/keeper/proposal_integration_test.go)
 
 ## Gov Integration
 The wasmd proposal handler can be added to the gov router in the [abci app](https://github.com/CosmWasm/wasmd/blob/master/app/app.go#L306)
@@ -44,7 +44,7 @@ Settings via sdk `params` module:
 - `code_upload_access` - who can upload a wasm binary: `Nobody`, `Everybody`, `OnlyAddress`
 - `instantiate_default_permission` - platform default, who can instantiate a wasm binary when the code owner has not set it 
 
-See [params.go](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/internal/types/params.go)
+See [params.go](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/types/params.go)
 
 ### Init Params Via Genesis 
 
@@ -69,9 +69,9 @@ As gov proposals bypass the existing authorzation policy they are diabled and re
 ```
 
 ### Tests
-* [params validation unit tests](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/internal/types/params_test.go)
-* [genesis validation tests](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/internal/types/genesis_test.go)
-* [policy integration tests](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/internal/keeper/keeper_test.go)
+* [params validation unit tests](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/types/params_test.go)
+* [genesis validation tests](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/types/genesis_test.go)
+* [policy integration tests](https://github.com/CosmWasm/wasmd/blob/master/x/wasm/keeper/keeper_test.go)
 
 ## CLI
 

x/wasm/alias.go

@@ -1,13 +1,13 @@
 // nolint
 // autogenerated code using github.com/rigelrozanski/multitool
 // aliases generated for the following subdirectories:
-// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/types
-// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/internal/keeper
+// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/types
+// ALIASGEN: github.com/cosmwasm/wasmd/x/wasm/keeper
 package wasm
 
 import (
-	"github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/keeper"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
 const (

x/wasm/client/cli/genesis_msg.go

@@ -9,7 +9,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"

x/wasm/client/cli/genesis_msg_test.go

@@ -8,8 +8,8 @@ import (
 	"path"
 	"testing"
 
-	"github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/keeper"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/crypto/hd"

x/wasm/client/cli/gov_tx.go

@@ -3,7 +3,7 @@ package cli
 import (
 	"fmt"
 
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"

x/wasm/client/cli/new_tx.go

@@ -3,7 +3,7 @@ package cli
 import (
 	"strconv"
 
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"

x/wasm/client/cli/query.go

@@ -10,7 +10,7 @@ import (
 	"io/ioutil"
 	"strconv"
 
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"

x/wasm/client/cli/tx.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	wasmUtils "github.com/CosmWasm/wasmd/x/wasm/client/utils"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"

x/wasm/client/proposal_handler_test.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
+	"github.com/CosmWasm/wasmd/x/wasm/keeper"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"

x/wasm/client/rest/gov.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"

x/wasm/client/rest/new_tx.go

@@ -3,7 +3,7 @@ package rest
 import (
 	"net/http"
 
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	"github.com/cosmos/cosmos-sdk/types/rest"

x/wasm/client/rest/query.go

@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/keeper"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/rest"

x/wasm/client/rest/tx.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	wasmUtils "github.com/CosmWasm/wasmd/x/wasm/client/utils"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/tx"
 	sdk "github.com/cosmos/cosmos-sdk/types"

x/wasm/client/utils/utils_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func GetTestData() ([]byte, []byte, []byte, error) {
-	wasmCode, err := ioutil.ReadFile("../../internal/keeper/testdata/hackatom.wasm")
+	wasmCode, err := ioutil.ReadFile("../../keeper/testdata/hackatom.wasm")
 
 	if err != nil {
 		return nil, nil, nil, err

x/wasm/handler.go

@@ -2,8 +2,8 @@ package wasm
 
 import (
 	"fmt"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
-	"github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	"github.com/CosmWasm/wasmd/x/wasm/keeper"
+	"github.com/CosmWasm/wasmd/x/wasm/types"
 	"github.com/gogo/protobuf/proto"
 	abci "github.com/tendermint/tendermint/abci/types"
 

x/wasm/ibc.go

@@ -1,7 +1,7 @@
 package wasm
 
 import (
-	wasmTypes "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+	wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
 	wasmvmtypes "github.com/CosmWasm/wasmvm/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"