diff --git a/contrib/local/00-genesis.sh b/contrib/local/00-genesis.sh
index 3c23b8d00f..29ef14f255 100755
--- a/contrib/local/00-genesis.sh
+++ b/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"
diff --git a/contrib/local/02-contracts.sh b/contrib/local/02-contracts.sh
index 4b4cc84d7f..f95c41bf3b 100755
--- a/contrib/local/02-contracts.sh
+++ b/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')
diff --git a/contrib/local/03-grpc-queries.sh b/contrib/local/03-grpc-queries.sh
index f4bdf8f97f..94ea59983f 100755
--- a/contrib/local/03-grpc-queries.sh
+++ b/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"
diff --git a/doc/proto.md b/doc/proto.md
index a1ae498748..6637b9a28f 100644
--- a/doc/proto.md
+++ b/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 @@
-
+
Top
-## x/wasm/internal/types/genesis.proto
+## x/wasm/types/genesis.proto
@@ -182,10 +182,10 @@ Sequence key and value of an id generation counter
-
+
Top
-## x/wasm/internal/types/ibc.proto
+## x/wasm/types/ibc.proto
@@ -231,10 +231,10 @@ MsgIBCSend
-
+
Top
-## 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.
-
+
Top
-## x/wasm/internal/types/query.proto
+## x/wasm/types/query.proto
@@ -698,10 +698,10 @@ Query provides defines the gRPC querier service
-
+
Top
-## x/wasm/internal/types/tx.proto
+## x/wasm/types/tx.proto
@@ -918,10 +918,10 @@ Msg defines the wasm Msg service.
-
+
Top
-## x/wasm/internal/types/types.proto
+## x/wasm/types/types.proto
diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh
index 187e0ec113..d355ddda50 100755
--- a/scripts/protocgen.sh
+++ b/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
diff --git a/x/wasm/Governance.md b/x/wasm/Governance.md
index 5be058497d..39295a0d7b 100644
--- a/x/wasm/Governance.md
+++ b/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
diff --git a/x/wasm/alias.go b/x/wasm/alias.go
index 608c1ec3fd..9d1dd9cc82 100644
--- a/x/wasm/alias.go
+++ b/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/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper"
)
const (
diff --git a/x/wasm/client/cli/genesis_msg.go b/x/wasm/client/cli/genesis_msg.go
index 2dbc5f1fb1..b881d90372 100644
--- a/x/wasm/client/cli/genesis_msg.go
+++ b/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"
diff --git a/x/wasm/client/cli/genesis_msg_test.go b/x/wasm/client/cli/genesis_msg_test.go
index d227d48921..5ba436a3c4 100644
--- a/x/wasm/client/cli/genesis_msg_test.go
+++ b/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/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/crypto/hd"
diff --git a/x/wasm/client/cli/gov_tx.go b/x/wasm/client/cli/gov_tx.go
index 75358cf2af..d36b82a5a6 100644
--- a/x/wasm/client/cli/gov_tx.go
+++ b/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"
diff --git a/x/wasm/client/cli/new_tx.go b/x/wasm/client/cli/new_tx.go
index aac409f424..b88cb44b47 100644
--- a/x/wasm/client/cli/new_tx.go
+++ b/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"
diff --git a/x/wasm/client/cli/query.go b/x/wasm/client/cli/query.go
index 4a1faed087..5cca7c1fea 100644
--- a/x/wasm/client/cli/query.go
+++ b/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"
diff --git a/x/wasm/client/cli/tx.go b/x/wasm/client/cli/tx.go
index e72d2c302c..a400fe9bc8 100644
--- a/x/wasm/client/cli/tx.go
+++ b/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"
diff --git a/x/wasm/client/proposal_handler_test.go b/x/wasm/client/proposal_handler_test.go
index 301f3018ab..6a289f42d7 100644
--- a/x/wasm/client/proposal_handler_test.go
+++ b/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"
diff --git a/x/wasm/client/rest/gov.go b/x/wasm/client/rest/gov.go
index d45736051c..0812e7ee3f 100644
--- a/x/wasm/client/rest/gov.go
+++ b/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"
diff --git a/x/wasm/client/rest/new_tx.go b/x/wasm/client/rest/new_tx.go
index 417380c0ba..4be0e0d337 100644
--- a/x/wasm/client/rest/new_tx.go
+++ b/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"
diff --git a/x/wasm/client/rest/query.go b/x/wasm/client/rest/query.go
index 7fc1741078..fbe38dff1e 100644
--- a/x/wasm/client/rest/query.go
+++ b/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/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper"
"github.com/cosmos/cosmos-sdk/client"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/rest"
diff --git a/x/wasm/client/rest/tx.go b/x/wasm/client/rest/tx.go
index 667e1ac3bd..b1c49d7181 100644
--- a/x/wasm/client/rest/tx.go
+++ b/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"
diff --git a/x/wasm/client/utils/utils_test.go b/x/wasm/client/utils/utils_test.go
index b6075d1b27..87a859911e 100644
--- a/x/wasm/client/utils/utils_test.go
+++ b/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
diff --git a/x/wasm/handler.go b/x/wasm/handler.go
index 4ef66bcd3d..103f808580 100644
--- a/x/wasm/handler.go
+++ b/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/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper"
"github.com/gogo/protobuf/proto"
abci "github.com/tendermint/tendermint/abci/types"
diff --git a/x/wasm/ibc.go b/x/wasm/ibc.go
index b887b772ce..6529aac67a 100644
--- a/x/wasm/ibc.go
+++ b/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"
diff --git a/x/wasm/ibc_reflect_test.go b/x/wasm/ibc_reflect_test.go
index 4ffde0ba3d..8abe168cb1 100644
--- a/x/wasm/ibc_reflect_test.go
+++ b/x/wasm/ibc_reflect_test.go
@@ -2,7 +2,7 @@ package wasm_test
import (
"github.com/CosmWasm/wasmd/x/wasm/ibctesting"
- wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
+ wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
ibcexported "github.com/cosmos/cosmos-sdk/x/ibc/core/exported"
@@ -20,14 +20,14 @@ func TestIBCReflectContract(t *testing.T) {
coordinator.CommitBlock(chainA, chainB)
initMsg := []byte(`{}`)
- codeID := chainA.StoreCodeFile("./internal/keeper/testdata/ibc_reflect_send.wasm").CodeID
+ codeID := chainA.StoreCodeFile("./keeper/testdata/ibc_reflect_send.wasm").CodeID
sendContractAddr := chainA.InstantiateContract(codeID, initMsg)
- reflectID := chainB.StoreCodeFile("./internal/keeper/testdata/reflect.wasm").CodeID
+ reflectID := chainB.StoreCodeFile("./keeper/testdata/reflect.wasm").CodeID
initMsg = wasmkeeper.IBCReflectInitMsg{
ReflectCodeID: reflectID,
}.GetBytes(t)
- codeID = chainB.StoreCodeFile("./internal/keeper/testdata/ibc_reflect.wasm").CodeID
+ codeID = chainB.StoreCodeFile("./keeper/testdata/ibc_reflect.wasm").CodeID
reflectContractAddr := chainB.InstantiateContract(codeID, initMsg)
var (
diff --git a/x/wasm/ibctesting/chain.go b/x/wasm/ibctesting/chain.go
index 67216b3888..7c7729f340 100644
--- a/x/wasm/ibctesting/chain.go
+++ b/x/wasm/ibctesting/chain.go
@@ -4,7 +4,7 @@ import (
"bytes"
"fmt"
wasmd "github.com/CosmWasm/wasmd/app"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper"
ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
"io/ioutil"
"os"
diff --git a/x/wasm/ibctesting/coordinator.go b/x/wasm/ibctesting/coordinator.go
index 1f4b83b25b..ab0c22b257 100644
--- a/x/wasm/ibctesting/coordinator.go
+++ b/x/wasm/ibctesting/coordinator.go
@@ -2,7 +2,7 @@ package ibctesting
import (
"fmt"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper"
ibctesting "github.com/cosmos/cosmos-sdk/x/ibc/testing"
"strconv"
"testing"
diff --git a/x/wasm/ibctesting/wasm.go b/x/wasm/ibctesting/wasm.go
index 5ffd298a72..36bd6d5c27 100644
--- a/x/wasm/ibctesting/wasm.go
+++ b/x/wasm/ibctesting/wasm.go
@@ -6,7 +6,7 @@ import (
"encoding/json"
"fmt"
wasmd "github.com/CosmWasm/wasmd/app"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/golang/protobuf/proto"
"github.com/stretchr/testify/require"
diff --git a/x/wasm/internal/keeper/api.go b/x/wasm/keeper/api.go
similarity index 100%
rename from x/wasm/internal/keeper/api.go
rename to x/wasm/keeper/api.go
diff --git a/x/wasm/internal/keeper/authz_policy.go b/x/wasm/keeper/authz_policy.go
similarity index 95%
rename from x/wasm/internal/keeper/authz_policy.go
rename to x/wasm/keeper/authz_policy.go
index 9193cd9cec..6a8c34676d 100644
--- a/x/wasm/internal/keeper/authz_policy.go
+++ b/x/wasm/keeper/authz_policy.go
@@ -1,7 +1,7 @@
package keeper
import (
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
)
diff --git a/x/wasm/internal/keeper/bench_test.go b/x/wasm/keeper/bench_test.go
similarity index 96%
rename from x/wasm/internal/keeper/bench_test.go
rename to x/wasm/keeper/bench_test.go
index 44e17930f1..341236887a 100644
--- a/x/wasm/internal/keeper/bench_test.go
+++ b/x/wasm/keeper/bench_test.go
@@ -1,7 +1,7 @@
package keeper
import (
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/stretchr/testify/require"
"github.com/syndtr/goleveldb/leveldb/opt"
dbm "github.com/tendermint/tm-db"
diff --git a/x/wasm/internal/keeper/genesis.go b/x/wasm/keeper/genesis.go
similarity index 98%
rename from x/wasm/internal/keeper/genesis.go
rename to x/wasm/keeper/genesis.go
index 391b45f936..49d71ae8c1 100644
--- a/x/wasm/internal/keeper/genesis.go
+++ b/x/wasm/keeper/genesis.go
@@ -1,7 +1,7 @@
package keeper
import (
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
abci "github.com/tendermint/tendermint/abci/types"
diff --git a/x/wasm/internal/keeper/genesis_test.go b/x/wasm/keeper/genesis_test.go
similarity index 99%
rename from x/wasm/internal/keeper/genesis_test.go
rename to x/wasm/keeper/genesis_test.go
index 27fd6edaf7..2dc2fa6821 100644
--- a/x/wasm/internal/keeper/genesis_test.go
+++ b/x/wasm/keeper/genesis_test.go
@@ -13,8 +13,8 @@ import (
"testing"
"time"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
- wasmTypes "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
+ wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/cosmos/cosmos-sdk/store"
sdk "github.com/cosmos/cosmos-sdk/types"
authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
diff --git a/x/wasm/internal/keeper/handler_plugin.go b/x/wasm/keeper/handler_plugin.go
similarity index 99%
rename from x/wasm/internal/keeper/handler_plugin.go
rename to x/wasm/keeper/handler_plugin.go
index e5cb369375..cc8c5b3ccd 100644
--- a/x/wasm/internal/keeper/handler_plugin.go
+++ b/x/wasm/keeper/handler_plugin.go
@@ -3,7 +3,7 @@ package keeper
import (
"errors"
"fmt"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/wasm/internal/keeper/handler_plugin_encoders.go b/x/wasm/keeper/handler_plugin_encoders.go
similarity index 99%
rename from x/wasm/internal/keeper/handler_plugin_encoders.go
rename to x/wasm/keeper/handler_plugin_encoders.go
index d2668f26d0..1381026518 100644
--- a/x/wasm/internal/keeper/handler_plugin_encoders.go
+++ b/x/wasm/keeper/handler_plugin_encoders.go
@@ -3,7 +3,7 @@ package keeper
import (
"encoding/json"
"fmt"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/wasm/internal/keeper/handler_plugin_encoders_test.go b/x/wasm/keeper/handler_plugin_encoders_test.go
similarity index 99%
rename from x/wasm/internal/keeper/handler_plugin_encoders_test.go
rename to x/wasm/keeper/handler_plugin_encoders_test.go
index bd70eeb6d1..eaeeeaf6d7 100644
--- a/x/wasm/internal/keeper/handler_plugin_encoders_test.go
+++ b/x/wasm/keeper/handler_plugin_encoders_test.go
@@ -11,7 +11,7 @@ import (
"github.com/golang/protobuf/proto"
"testing"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
diff --git a/x/wasm/internal/keeper/handler_plugin_test.go b/x/wasm/keeper/handler_plugin_test.go
similarity index 98%
rename from x/wasm/internal/keeper/handler_plugin_test.go
rename to x/wasm/keeper/handler_plugin_test.go
index f28be41ade..8b3a6521b1 100644
--- a/x/wasm/internal/keeper/handler_plugin_test.go
+++ b/x/wasm/keeper/handler_plugin_test.go
@@ -2,8 +2,8 @@ package keeper
import (
"encoding/json"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
"github.com/cosmos/cosmos-sdk/baseapp"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/wasm/internal/keeper/ibc.go b/x/wasm/keeper/ibc.go
similarity index 97%
rename from x/wasm/internal/keeper/ibc.go
rename to x/wasm/keeper/ibc.go
index 5939be7a99..6e9cac7b0f 100644
--- a/x/wasm/internal/keeper/ibc.go
+++ b/x/wasm/keeper/ibc.go
@@ -3,7 +3,7 @@ package keeper
import (
"strings"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
diff --git a/x/wasm/internal/keeper/ibc_test.go b/x/wasm/keeper/ibc_test.go
similarity index 100%
rename from x/wasm/internal/keeper/ibc_test.go
rename to x/wasm/keeper/ibc_test.go
diff --git a/x/wasm/internal/keeper/ioutil.go b/x/wasm/keeper/ioutil.go
similarity index 95%
rename from x/wasm/internal/keeper/ioutil.go
rename to x/wasm/keeper/ioutil.go
index dd3bc31ce3..5bb7bbbf92 100644
--- a/x/wasm/internal/keeper/ioutil.go
+++ b/x/wasm/keeper/ioutil.go
@@ -6,7 +6,7 @@ import (
"io"
"io/ioutil"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
)
// magic bytes to identify gzip.
diff --git a/x/wasm/internal/keeper/ioutil_test.go b/x/wasm/keeper/ioutil_test.go
similarity index 97%
rename from x/wasm/internal/keeper/ioutil_test.go
rename to x/wasm/keeper/ioutil_test.go
index 972a3ed495..b126e87fde 100644
--- a/x/wasm/internal/keeper/ioutil_test.go
+++ b/x/wasm/keeper/ioutil_test.go
@@ -9,7 +9,7 @@ import (
"strings"
"testing"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
diff --git a/x/wasm/internal/keeper/keeper.go b/x/wasm/keeper/keeper.go
similarity index 99%
rename from x/wasm/internal/keeper/keeper.go
rename to x/wasm/keeper/keeper.go
index 9c46232317..ef487004bb 100644
--- a/x/wasm/internal/keeper/keeper.go
+++ b/x/wasm/keeper/keeper.go
@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/binary"
"fmt"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
wasmvm "github.com/CosmWasm/wasmvm"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
"github.com/cosmos/cosmos-sdk/codec"
diff --git a/x/wasm/internal/keeper/keeper_test.go b/x/wasm/keeper/keeper_test.go
similarity index 99%
rename from x/wasm/internal/keeper/keeper_test.go
rename to x/wasm/keeper/keeper_test.go
index 11433229d7..85de5c861d 100644
--- a/x/wasm/internal/keeper/keeper_test.go
+++ b/x/wasm/keeper/keeper_test.go
@@ -4,7 +4,7 @@ import (
"bytes"
"encoding/json"
"errors"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
wasmvm "github.com/CosmWasm/wasmvm"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
@@ -12,7 +12,7 @@ import (
"testing"
"time"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
stypes "github.com/cosmos/cosmos-sdk/store/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
diff --git a/x/wasm/internal/keeper/legacy_querier.go b/x/wasm/keeper/legacy_querier.go
similarity index 99%
rename from x/wasm/internal/keeper/legacy_querier.go
rename to x/wasm/keeper/legacy_querier.go
index 12eb987eaf..ac66f2236f 100644
--- a/x/wasm/internal/keeper/legacy_querier.go
+++ b/x/wasm/keeper/legacy_querier.go
@@ -7,7 +7,7 @@ import (
"strconv"
"strings"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
abci "github.com/tendermint/tendermint/abci/types"
diff --git a/x/wasm/internal/keeper/legacy_querier_test.go b/x/wasm/keeper/legacy_querier_test.go
similarity index 99%
rename from x/wasm/internal/keeper/legacy_querier_test.go
rename to x/wasm/keeper/legacy_querier_test.go
index 80379f1de5..f056189981 100644
--- a/x/wasm/internal/keeper/legacy_querier_test.go
+++ b/x/wasm/keeper/legacy_querier_test.go
@@ -7,7 +7,7 @@ import (
"io/ioutil"
"testing"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkErrors "github.com/cosmos/cosmos-sdk/types/errors"
"github.com/stretchr/testify/assert"
diff --git a/x/wasm/internal/keeper/msg_server.go b/x/wasm/keeper/msg_server.go
similarity index 99%
rename from x/wasm/internal/keeper/msg_server.go
rename to x/wasm/keeper/msg_server.go
index 58e96aaeea..47ac36a344 100644
--- a/x/wasm/internal/keeper/msg_server.go
+++ b/x/wasm/keeper/msg_server.go
@@ -3,7 +3,7 @@ package keeper
import (
"context"
"fmt"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
)
diff --git a/x/wasm/internal/keeper/options.go b/x/wasm/keeper/options.go
similarity index 97%
rename from x/wasm/internal/keeper/options.go
rename to x/wasm/keeper/options.go
index cdb8590366..3e399efad3 100644
--- a/x/wasm/internal/keeper/options.go
+++ b/x/wasm/keeper/options.go
@@ -2,7 +2,7 @@ package keeper
import (
"fmt"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
)
type optsFn func(*Keeper)
diff --git a/x/wasm/internal/keeper/options_test.go b/x/wasm/keeper/options_test.go
similarity index 93%
rename from x/wasm/internal/keeper/options_test.go
rename to x/wasm/keeper/options_test.go
index eb6860f7fd..63c1c90473 100644
--- a/x/wasm/internal/keeper/options_test.go
+++ b/x/wasm/keeper/options_test.go
@@ -1,8 +1,8 @@
package keeper
import (
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
distributionkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
diff --git a/x/wasm/internal/keeper/proposal_handler.go b/x/wasm/keeper/proposal_handler.go
similarity index 99%
rename from x/wasm/internal/keeper/proposal_handler.go
rename to x/wasm/keeper/proposal_handler.go
index 878c6a9fc9..adc584a3d5 100644
--- a/x/wasm/internal/keeper/proposal_handler.go
+++ b/x/wasm/keeper/proposal_handler.go
@@ -5,7 +5,7 @@ import (
"strconv"
"strings"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
diff --git a/x/wasm/internal/keeper/proposal_integration_test.go b/x/wasm/keeper/proposal_integration_test.go
similarity index 99%
rename from x/wasm/internal/keeper/proposal_integration_test.go
rename to x/wasm/keeper/proposal_integration_test.go
index bd7e3f508f..869bb3f7d2 100644
--- a/x/wasm/internal/keeper/proposal_integration_test.go
+++ b/x/wasm/keeper/proposal_integration_test.go
@@ -5,12 +5,12 @@ import (
"encoding/hex"
"encoding/json"
"errors"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
wasmvm "github.com/CosmWasm/wasmvm"
"io/ioutil"
"testing"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
"github.com/cosmos/cosmos-sdk/x/params/types/proposal"
diff --git a/x/wasm/internal/keeper/querier.go b/x/wasm/keeper/querier.go
similarity index 99%
rename from x/wasm/internal/keeper/querier.go
rename to x/wasm/keeper/querier.go
index 4e7fb08fae..1ac865b5b1 100644
--- a/x/wasm/internal/keeper/querier.go
+++ b/x/wasm/keeper/querier.go
@@ -7,7 +7,7 @@ import (
"google.golang.org/grpc/status"
"runtime/debug"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/cosmos/cosmos-sdk/store/prefix"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
diff --git a/x/wasm/internal/keeper/querier_test.go b/x/wasm/keeper/querier_test.go
similarity index 99%
rename from x/wasm/internal/keeper/querier_test.go
rename to x/wasm/keeper/querier_test.go
index 42c8cd70a1..1c9c5e2064 100644
--- a/x/wasm/internal/keeper/querier_test.go
+++ b/x/wasm/keeper/querier_test.go
@@ -4,11 +4,11 @@ import (
"encoding/base64"
"encoding/json"
"fmt"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
"io/ioutil"
"testing"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/CosmWasm/wasmvm"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/wasm/internal/keeper/query_plugins.go b/x/wasm/keeper/query_plugins.go
similarity index 99%
rename from x/wasm/internal/keeper/query_plugins.go
rename to x/wasm/keeper/query_plugins.go
index c4f6a299b8..b1f038359e 100644
--- a/x/wasm/internal/keeper/query_plugins.go
+++ b/x/wasm/keeper/query_plugins.go
@@ -3,7 +3,7 @@ package keeper
import (
"encoding/json"
"fmt"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
channeltypes "github.com/cosmos/cosmos-sdk/x/ibc/core/04-channel/types"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
diff --git a/x/wasm/internal/keeper/query_plugins_test.go b/x/wasm/keeper/query_plugins_test.go
similarity index 98%
rename from x/wasm/internal/keeper/query_plugins_test.go
rename to x/wasm/keeper/query_plugins_test.go
index 98cc6bc24d..569dc31029 100644
--- a/x/wasm/internal/keeper/query_plugins_test.go
+++ b/x/wasm/keeper/query_plugins_test.go
@@ -1,8 +1,8 @@
package keeper
import (
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
diff --git a/x/wasm/internal/keeper/recurse_test.go b/x/wasm/keeper/recurse_test.go
similarity index 98%
rename from x/wasm/internal/keeper/recurse_test.go
rename to x/wasm/keeper/recurse_test.go
index bedb9aa0d1..754b41dfb5 100644
--- a/x/wasm/internal/keeper/recurse_test.go
+++ b/x/wasm/keeper/recurse_test.go
@@ -2,8 +2,8 @@ package keeper
import (
"encoding/json"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
"testing"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
diff --git a/x/wasm/internal/keeper/reflect_test.go b/x/wasm/keeper/reflect_test.go
similarity index 99%
rename from x/wasm/internal/keeper/reflect_test.go
rename to x/wasm/keeper/reflect_test.go
index cd1272205b..3bacea8352 100644
--- a/x/wasm/internal/keeper/reflect_test.go
+++ b/x/wasm/keeper/reflect_test.go
@@ -7,7 +7,7 @@ import (
"strings"
"testing"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
diff --git a/x/wasm/internal/keeper/relay.go b/x/wasm/keeper/relay.go
similarity index 99%
rename from x/wasm/internal/keeper/relay.go
rename to x/wasm/keeper/relay.go
index 862e8ce5cb..992b91480c 100644
--- a/x/wasm/internal/keeper/relay.go
+++ b/x/wasm/keeper/relay.go
@@ -1,7 +1,7 @@
package keeper
import (
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
"github.com/cosmos/cosmos-sdk/telemetry"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/wasm/internal/keeper/relay_test.go b/x/wasm/keeper/relay_test.go
similarity index 99%
rename from x/wasm/internal/keeper/relay_test.go
rename to x/wasm/keeper/relay_test.go
index bcea274ccf..330e948112 100644
--- a/x/wasm/internal/keeper/relay_test.go
+++ b/x/wasm/keeper/relay_test.go
@@ -3,7 +3,7 @@ package keeper
import (
"encoding/json"
"errors"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
wasmvm "github.com/CosmWasm/wasmvm"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/wasm/internal/keeper/staking_test.go b/x/wasm/keeper/staking_test.go
similarity index 100%
rename from x/wasm/internal/keeper/staking_test.go
rename to x/wasm/keeper/staking_test.go
diff --git a/x/wasm/internal/keeper/submsg_test.go b/x/wasm/keeper/submsg_test.go
similarity index 100%
rename from x/wasm/internal/keeper/submsg_test.go
rename to x/wasm/keeper/submsg_test.go
diff --git a/x/wasm/internal/keeper/test_common.go b/x/wasm/keeper/test_common.go
similarity index 99%
rename from x/wasm/internal/keeper/test_common.go
rename to x/wasm/keeper/test_common.go
index 80f40d2286..a1cc7cd93c 100644
--- a/x/wasm/internal/keeper/test_common.go
+++ b/x/wasm/keeper/test_common.go
@@ -4,8 +4,8 @@ import (
"encoding/binary"
"encoding/json"
"fmt"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
- types "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
diff --git a/x/wasm/internal/keeper/test_fuzz.go b/x/wasm/keeper/test_fuzz.go
similarity index 97%
rename from x/wasm/internal/keeper/test_fuzz.go
rename to x/wasm/keeper/test_fuzz.go
index b693e28848..74d6032ce9 100644
--- a/x/wasm/internal/keeper/test_fuzz.go
+++ b/x/wasm/keeper/test_fuzz.go
@@ -3,7 +3,7 @@ package keeper
import (
"encoding/json"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
fuzz "github.com/google/gofuzz"
tmBytes "github.com/tendermint/tendermint/libs/bytes"
diff --git a/x/wasm/internal/keeper/testdata/burner.wasm b/x/wasm/keeper/testdata/burner.wasm
similarity index 100%
rename from x/wasm/internal/keeper/testdata/burner.wasm
rename to x/wasm/keeper/testdata/burner.wasm
diff --git a/x/wasm/internal/keeper/testdata/download_releases.sh b/x/wasm/keeper/testdata/download_releases.sh
similarity index 100%
rename from x/wasm/internal/keeper/testdata/download_releases.sh
rename to x/wasm/keeper/testdata/download_releases.sh
diff --git a/x/wasm/internal/keeper/testdata/genesis.json b/x/wasm/keeper/testdata/genesis.json
similarity index 100%
rename from x/wasm/internal/keeper/testdata/genesis.json
rename to x/wasm/keeper/testdata/genesis.json
diff --git a/x/wasm/internal/keeper/testdata/hackatom.wasm b/x/wasm/keeper/testdata/hackatom.wasm
similarity index 100%
rename from x/wasm/internal/keeper/testdata/hackatom.wasm
rename to x/wasm/keeper/testdata/hackatom.wasm
diff --git a/x/wasm/internal/keeper/testdata/hackatom.wasm.gzip b/x/wasm/keeper/testdata/hackatom.wasm.gzip
similarity index 100%
rename from x/wasm/internal/keeper/testdata/hackatom.wasm.gzip
rename to x/wasm/keeper/testdata/hackatom.wasm.gzip
diff --git a/x/wasm/internal/keeper/testdata/ibc_reflect.wasm b/x/wasm/keeper/testdata/ibc_reflect.wasm
similarity index 100%
rename from x/wasm/internal/keeper/testdata/ibc_reflect.wasm
rename to x/wasm/keeper/testdata/ibc_reflect.wasm
diff --git a/x/wasm/internal/keeper/testdata/ibc_reflect_send.wasm b/x/wasm/keeper/testdata/ibc_reflect_send.wasm
similarity index 100%
rename from x/wasm/internal/keeper/testdata/ibc_reflect_send.wasm
rename to x/wasm/keeper/testdata/ibc_reflect_send.wasm
diff --git a/x/wasm/internal/keeper/testdata/reflect.wasm b/x/wasm/keeper/testdata/reflect.wasm
similarity index 100%
rename from x/wasm/internal/keeper/testdata/reflect.wasm
rename to x/wasm/keeper/testdata/reflect.wasm
diff --git a/x/wasm/internal/keeper/testdata/staking.wasm b/x/wasm/keeper/testdata/staking.wasm
similarity index 100%
rename from x/wasm/internal/keeper/testdata/staking.wasm
rename to x/wasm/keeper/testdata/staking.wasm
diff --git a/x/wasm/internal/keeper/wasmtesting/coin_transferrer.go b/x/wasm/keeper/wasmtesting/coin_transferrer.go
similarity index 100%
rename from x/wasm/internal/keeper/wasmtesting/coin_transferrer.go
rename to x/wasm/keeper/wasmtesting/coin_transferrer.go
diff --git a/x/wasm/internal/keeper/wasmtesting/messenger.go b/x/wasm/keeper/wasmtesting/messenger.go
similarity index 100%
rename from x/wasm/internal/keeper/wasmtesting/messenger.go
rename to x/wasm/keeper/wasmtesting/messenger.go
diff --git a/x/wasm/internal/keeper/wasmtesting/mock_engine.go b/x/wasm/keeper/wasmtesting/mock_engine.go
similarity index 99%
rename from x/wasm/internal/keeper/wasmtesting/mock_engine.go
rename to x/wasm/keeper/wasmtesting/mock_engine.go
index 5a8ae940d2..d0dc0d695e 100644
--- a/x/wasm/internal/keeper/wasmtesting/mock_engine.go
+++ b/x/wasm/keeper/wasmtesting/mock_engine.go
@@ -3,7 +3,7 @@ package wasmtesting
import (
"bytes"
"crypto/sha256"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
wasmvm "github.com/CosmWasm/wasmvm"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
diff --git a/x/wasm/internal/keeper/wasmtesting/mock_keepers.go b/x/wasm/keeper/wasmtesting/mock_keepers.go
similarity index 100%
rename from x/wasm/internal/keeper/wasmtesting/mock_keepers.go
rename to x/wasm/keeper/wasmtesting/mock_keepers.go
diff --git a/x/wasm/internal/keeper/wasmtesting/query_handler.go b/x/wasm/keeper/wasmtesting/query_handler.go
similarity index 100%
rename from x/wasm/internal/keeper/wasmtesting/query_handler.go
rename to x/wasm/keeper/wasmtesting/query_handler.go
diff --git a/x/wasm/module.go b/x/wasm/module.go
index b74a8bb78e..98b16b3e24 100644
--- a/x/wasm/module.go
+++ b/x/wasm/module.go
@@ -7,8 +7,8 @@ import (
"github.com/CosmWasm/wasmd/x/wasm/client/cli"
"github.com/CosmWasm/wasmd/x/wasm/client/rest"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper"
"github.com/CosmWasm/wasmd/x/wasm/simulation"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/codec"
diff --git a/x/wasm/module_test.go b/x/wasm/module_test.go
index a239151842..383b19bbee 100644
--- a/x/wasm/module_test.go
+++ b/x/wasm/module_test.go
@@ -6,8 +6,8 @@ import (
"io/ioutil"
"testing"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
@@ -64,8 +64,8 @@ func mustLoad(path string) []byte {
var (
_, _, addrAcc1 = keyPubAddr()
addr1 = addrAcc1.String()
- testContract = mustLoad("./internal/keeper/testdata/hackatom.wasm")
- maskContract = mustLoad("./internal/keeper/testdata/reflect.wasm")
+ testContract = mustLoad("./keeper/testdata/hackatom.wasm")
+ maskContract = mustLoad("./keeper/testdata/reflect.wasm")
oldContract = mustLoad("./testdata/escrow_0.7.wasm")
)
diff --git a/x/wasm/relay_pingpong_test.go b/x/wasm/relay_pingpong_test.go
index f3b809c070..df9ed3b2b2 100644
--- a/x/wasm/relay_pingpong_test.go
+++ b/x/wasm/relay_pingpong_test.go
@@ -5,9 +5,9 @@ import (
"fmt"
wasmd "github.com/CosmWasm/wasmd/app"
wasmibctesting "github.com/CosmWasm/wasmd/x/wasm/ibctesting"
- wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
- "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
- wasmtypes "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
+ wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
+ "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
wasmvm "github.com/CosmWasm/wasmvm"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
"github.com/cosmos/cosmos-sdk/store/prefix"
diff --git a/x/wasm/relay_test.go b/x/wasm/relay_test.go
index 1d764465bf..18fc107b3d 100644
--- a/x/wasm/relay_test.go
+++ b/x/wasm/relay_test.go
@@ -4,9 +4,9 @@ import (
"encoding/json"
wasmd "github.com/CosmWasm/wasmd/app"
"github.com/CosmWasm/wasmd/x/wasm/ibctesting"
- wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/internal/keeper"
- wasmtesting "github.com/CosmWasm/wasmd/x/wasm/internal/keeper/wasmtesting"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
+ wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
+ wasmtesting "github.com/CosmWasm/wasmd/x/wasm/keeper/wasmtesting"
wasmvm "github.com/CosmWasm/wasmvm"
wasmvmtypes "github.com/CosmWasm/wasmvm/types"
sdk "github.com/cosmos/cosmos-sdk/types"
diff --git a/x/wasm/simulation/genesis.go b/x/wasm/simulation/genesis.go
index fb61889f8a..a5eb597fe4 100644
--- a/x/wasm/simulation/genesis.go
+++ b/x/wasm/simulation/genesis.go
@@ -1,7 +1,7 @@
package simulation
import (
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/cosmos/cosmos-sdk/types/module"
)
diff --git a/x/wasm/simulation/params.go b/x/wasm/simulation/params.go
index 516e6c48ea..aac662f572 100644
--- a/x/wasm/simulation/params.go
+++ b/x/wasm/simulation/params.go
@@ -4,7 +4,7 @@ import (
"fmt"
"math/rand"
- "github.com/CosmWasm/wasmd/x/wasm/internal/types"
+ "github.com/CosmWasm/wasmd/x/wasm/types"
"github.com/cosmos/cosmos-sdk/codec"
simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
"github.com/cosmos/cosmos-sdk/x/simulation"
diff --git a/x/wasm/internal/types/codec.go b/x/wasm/types/codec.go
similarity index 100%
rename from x/wasm/internal/types/codec.go
rename to x/wasm/types/codec.go
diff --git a/x/wasm/internal/types/errors.go b/x/wasm/types/errors.go
similarity index 100%
rename from x/wasm/internal/types/errors.go
rename to x/wasm/types/errors.go
diff --git a/x/wasm/internal/types/events.go b/x/wasm/types/events.go
similarity index 100%
rename from x/wasm/internal/types/events.go
rename to x/wasm/types/events.go
diff --git a/x/wasm/internal/types/expected_keepers.go b/x/wasm/types/expected_keepers.go
similarity index 100%
rename from x/wasm/internal/types/expected_keepers.go
rename to x/wasm/types/expected_keepers.go
diff --git a/x/wasm/internal/types/feature_flag.go b/x/wasm/types/feature_flag.go
similarity index 100%
rename from x/wasm/internal/types/feature_flag.go
rename to x/wasm/types/feature_flag.go
diff --git a/x/wasm/internal/types/genesis.go b/x/wasm/types/genesis.go
similarity index 100%
rename from x/wasm/internal/types/genesis.go
rename to x/wasm/types/genesis.go
diff --git a/x/wasm/internal/types/genesis.pb.go b/x/wasm/types/genesis.pb.go
similarity index 90%
rename from x/wasm/internal/types/genesis.pb.go
rename to x/wasm/types/genesis.pb.go
index 25cd5d06d2..fcb3e6ba19 100644
--- a/x/wasm/internal/types/genesis.pb.go
+++ b/x/wasm/types/genesis.pb.go
@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: x/wasm/internal/types/genesis.proto
+// source: x/wasm/types/genesis.proto
package types
@@ -36,7 +36,7 @@ func (m *GenesisState) Reset() { *m = GenesisState{} }
func (m *GenesisState) String() string { return proto.CompactTextString(m) }
func (*GenesisState) ProtoMessage() {}
func (*GenesisState) Descriptor() ([]byte, []int) {
- return fileDescriptor_52f9f2715025dba8, []int{0}
+ return fileDescriptor_8590831cc863f337, []int{0}
}
func (m *GenesisState) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -116,7 +116,7 @@ func (m *GenesisState_GenMsgs) Reset() { *m = GenesisState_GenMsgs{} }
func (m *GenesisState_GenMsgs) String() string { return proto.CompactTextString(m) }
func (*GenesisState_GenMsgs) ProtoMessage() {}
func (*GenesisState_GenMsgs) Descriptor() ([]byte, []int) {
- return fileDescriptor_52f9f2715025dba8, []int{0, 0}
+ return fileDescriptor_8590831cc863f337, []int{0, 0}
}
func (m *GenesisState_GenMsgs) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -215,7 +215,7 @@ func (m *Code) Reset() { *m = Code{} }
func (m *Code) String() string { return proto.CompactTextString(m) }
func (*Code) ProtoMessage() {}
func (*Code) Descriptor() ([]byte, []int) {
- return fileDescriptor_52f9f2715025dba8, []int{1}
+ return fileDescriptor_8590831cc863f337, []int{1}
}
func (m *Code) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -283,7 +283,7 @@ func (m *Contract) Reset() { *m = Contract{} }
func (m *Contract) String() string { return proto.CompactTextString(m) }
func (*Contract) ProtoMessage() {}
func (*Contract) Descriptor() ([]byte, []int) {
- return fileDescriptor_52f9f2715025dba8, []int{2}
+ return fileDescriptor_8590831cc863f337, []int{2}
}
func (m *Contract) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -343,7 +343,7 @@ func (m *Sequence) Reset() { *m = Sequence{} }
func (m *Sequence) String() string { return proto.CompactTextString(m) }
func (*Sequence) ProtoMessage() {}
func (*Sequence) Descriptor() ([]byte, []int) {
- return fileDescriptor_52f9f2715025dba8, []int{3}
+ return fileDescriptor_8590831cc863f337, []int{3}
}
func (m *Sequence) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -394,53 +394,51 @@ func init() {
proto.RegisterType((*Sequence)(nil), "cosmwasm.wasm.v1beta1.Sequence")
}
-func init() {
- proto.RegisterFile("x/wasm/internal/types/genesis.proto", fileDescriptor_52f9f2715025dba8)
-}
-
-var fileDescriptor_52f9f2715025dba8 = []byte{
- // 656 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xc1, 0x6e, 0xd3, 0x4c,
- 0x10, 0xc7, 0xe3, 0x26, 0x4e, 0x93, 0x69, 0xbe, 0xaf, 0xd5, 0xb6, 0x80, 0x95, 0x52, 0x27, 0x24,
- 0x97, 0x56, 0x40, 0x4c, 0xcb, 0x91, 0x13, 0x6e, 0x11, 0x4d, 0xab, 0x22, 0xe4, 0x4a, 0x20, 0xf5,
- 0x12, 0x39, 0xf6, 0xd4, 0x58, 0xd4, 0xde, 0x90, 0xdd, 0x94, 0xe4, 0x2d, 0x10, 0x0f, 0xc1, 0xb3,
- 0xf4, 0xd8, 0x23, 0xa7, 0x08, 0xa5, 0x37, 0x9e, 0x02, 0xed, 0x7a, 0xe3, 0xb8, 0xa2, 0x2e, 0x17,
- 0x27, 0x33, 0xfb, 0x9f, 0xdf, 0xce, 0xcc, 0xce, 0x2e, 0xb4, 0xc7, 0xd6, 0x57, 0x97, 0x45, 0x56,
- 0x18, 0x73, 0x1c, 0xc6, 0xee, 0x85, 0xc5, 0x27, 0x03, 0x64, 0x56, 0x80, 0x31, 0xb2, 0x90, 0x75,
- 0x06, 0x43, 0xca, 0x29, 0x79, 0xe0, 0x51, 0x16, 0x09, 0x59, 0x47, 0x7e, 0x2e, 0x77, 0xfb, 0xc8,
- 0xdd, 0xdd, 0xfa, 0x46, 0x40, 0x03, 0x2a, 0x15, 0x96, 0xf8, 0x97, 0x88, 0xeb, 0x4f, 0xee, 0x26,
- 0xca, 0xaf, 0x92, 0x98, 0x39, 0x92, 0x71, 0xb2, 0xde, 0xba, 0xd2, 0xa1, 0xf6, 0x36, 0xc9, 0xe0,
- 0x94, 0xbb, 0x1c, 0xc9, 0x2b, 0x28, 0x0f, 0xdc, 0xa1, 0x1b, 0x31, 0x43, 0x6b, 0x6a, 0xdb, 0x2b,
- 0x7b, 0x5b, 0x9d, 0x3b, 0x33, 0xea, 0xbc, 0x97, 0x22, 0xbb, 0x74, 0x35, 0x6d, 0x14, 0x1c, 0x15,
- 0x42, 0x8e, 0x40, 0xf7, 0xa8, 0x8f, 0xcc, 0x58, 0x6a, 0x16, 0xb7, 0x57, 0xf6, 0x36, 0x73, 0x62,
- 0xf7, 0xa9, 0x8f, 0xf6, 0x23, 0x11, 0xf9, 0x7b, 0xda, 0x58, 0x95, 0x11, 0xcf, 0x68, 0x14, 0x72,
- 0x8c, 0x06, 0x7c, 0xe2, 0x24, 0x08, 0x72, 0x06, 0x55, 0x8f, 0xc6, 0x7c, 0xe8, 0x7a, 0x9c, 0x19,
- 0x45, 0xc9, 0x6b, 0xe4, 0xf2, 0x12, 0x9d, 0xbd, 0xa9, 0x98, 0xeb, 0x69, 0x64, 0x86, 0xbb, 0xc0,
- 0x09, 0x36, 0xc3, 0x2f, 0x23, 0x8c, 0x3d, 0x64, 0x46, 0xe9, 0x5e, 0xf6, 0xa9, 0xd2, 0x2d, 0xd8,
- 0x69, 0x64, 0x96, 0x9d, 0x3a, 0x49, 0x1f, 0x2a, 0x01, 0xc6, 0xbd, 0x88, 0x05, 0xcc, 0xd0, 0x25,
- 0xfa, 0x69, 0x0e, 0x3a, 0xdb, 0x77, 0x61, 0x9c, 0xb0, 0x80, 0xd9, 0x75, 0xb5, 0x0d, 0x99, 0x43,
- 0x32, 0xbb, 0x2c, 0x07, 0x89, 0xa8, 0xfe, 0x7d, 0x09, 0x96, 0x55, 0x00, 0x39, 0x00, 0x60, 0x9c,
- 0x0e, 0xb1, 0x27, 0xda, 0xa6, 0x0e, 0xad, 0x9d, 0xb3, 0xe3, 0x09, 0x0b, 0x4e, 0x85, 0x56, 0x1c,
- 0xc0, 0x61, 0xc1, 0xa9, 0xb2, 0xb9, 0x41, 0xfa, 0xb0, 0x11, 0xc6, 0x8c, 0xbb, 0x31, 0x0f, 0x5d,
- 0x2e, 0x58, 0x49, 0xab, 0x8c, 0x25, 0xc9, 0x7b, 0x9e, 0xcf, 0xeb, 0x2e, 0xa2, 0xe6, 0xc7, 0x70,
- 0x58, 0x70, 0xd6, 0xc3, 0xbf, 0xdd, 0xe4, 0x03, 0xac, 0xe1, 0x18, 0xbd, 0x51, 0x96, 0x5f, 0x94,
- 0xfc, 0x9d, 0x7c, 0xfe, 0x9b, 0x24, 0x22, 0xc3, 0x5e, 0xc5, 0xdb, 0x2e, 0x5b, 0x87, 0x22, 0x1b,
- 0x45, 0xad, 0x1f, 0x1a, 0x94, 0x64, 0x2d, 0x6d, 0x58, 0x16, 0xbd, 0xe8, 0x85, 0xbe, 0x6c, 0x47,
- 0xc9, 0x86, 0xd9, 0xb4, 0x51, 0x16, 0x4b, 0xdd, 0x03, 0xa7, 0x2c, 0x96, 0xba, 0x3e, 0xb1, 0xc5,
- 0x78, 0x09, 0x51, 0x7c, 0x4e, 0x55, 0x95, 0x8d, 0x7b, 0xc6, 0xb5, 0x1b, 0x9f, 0x53, 0x35, 0xec,
- 0x15, 0x4f, 0xd9, 0x64, 0x0b, 0x40, 0x32, 0xfa, 0x13, 0x8e, 0x4c, 0x96, 0x52, 0x73, 0x24, 0xd5,
- 0x16, 0x0e, 0xf2, 0x10, 0xca, 0x83, 0x30, 0x8e, 0xd1, 0x37, 0x4a, 0x4d, 0x6d, 0xbb, 0xe2, 0x28,
- 0xab, 0x75, 0xad, 0x41, 0x25, 0x6d, 0xca, 0x0e, 0xac, 0xcd, 0x9b, 0xd1, 0x73, 0x7d, 0x7f, 0x88,
- 0x2c, 0xb9, 0x79, 0x55, 0x67, 0x75, 0xee, 0x7f, 0x9d, 0xb8, 0xc9, 0x3b, 0xf8, 0x2f, 0x95, 0x66,
- 0xd2, 0x6e, 0xff, 0xe3, 0x56, 0x64, 0x52, 0xaf, 0x79, 0x19, 0x1f, 0xe9, 0xc2, 0xff, 0x29, 0x8f,
- 0x89, 0x21, 0x54, 0xd7, 0xec, 0x71, 0xde, 0x69, 0x50, 0x1f, 0x2f, 0x14, 0x29, 0xcd, 0x44, 0x4e,
- 0x6f, 0xcb, 0x86, 0xca, 0xfc, 0xa2, 0x90, 0x26, 0x94, 0x43, 0xbf, 0xf7, 0x19, 0x27, 0xb2, 0x8e,
- 0x9a, 0x5d, 0x9d, 0x4d, 0x1b, 0x7a, 0xf7, 0xe0, 0x18, 0x27, 0x8e, 0x1e, 0xfa, 0xc7, 0x38, 0x21,
- 0x1b, 0xa0, 0x5f, 0xba, 0x17, 0x23, 0x94, 0x05, 0x94, 0x9c, 0xc4, 0xb0, 0x8f, 0xae, 0x66, 0xa6,
- 0x76, 0x3d, 0x33, 0xb5, 0x5f, 0x33, 0x53, 0xfb, 0x76, 0x63, 0x16, 0xae, 0x6f, 0xcc, 0xc2, 0xcf,
- 0x1b, 0xb3, 0x70, 0xf6, 0x22, 0x08, 0xf9, 0xa7, 0x51, 0xbf, 0xe3, 0xd1, 0xc8, 0xda, 0xa7, 0x2c,
- 0xfa, 0x28, 0x5e, 0x34, 0x91, 0x9a, 0x6f, 0x8d, 0xd5, 0xef, 0xed, 0xf7, 0xad, 0x5f, 0x96, 0xaf,
- 0xdb, 0xcb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa3, 0xad, 0xe9, 0xdd, 0x74, 0x05, 0x00, 0x00,
+func init() { proto.RegisterFile("x/wasm/types/genesis.proto", fileDescriptor_8590831cc863f337) }
+
+var fileDescriptor_8590831cc863f337 = []byte{
+ // 646 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x94, 0xcd, 0x6e, 0xd3, 0x40,
+ 0x10, 0xc7, 0xe3, 0x26, 0x4e, 0x93, 0x69, 0xa0, 0xd5, 0xb6, 0x05, 0x2b, 0xa5, 0x49, 0x94, 0x4a,
+ 0xa8, 0x15, 0x90, 0xa8, 0xe5, 0xc8, 0x05, 0xdc, 0x22, 0x1a, 0xaa, 0x22, 0xe4, 0x4a, 0x20, 0xf5,
+ 0x12, 0xf9, 0x63, 0x6a, 0x2c, 0x6a, 0x6f, 0xc8, 0x6e, 0x4a, 0xfd, 0x16, 0x88, 0x87, 0xe0, 0x59,
+ 0x7a, 0xec, 0x91, 0x53, 0x84, 0xd2, 0x1b, 0x4f, 0x81, 0x76, 0xbd, 0x76, 0x1d, 0x81, 0xcb, 0xc5,
+ 0xf2, 0xce, 0xcc, 0xff, 0x37, 0x3b, 0xb3, 0xb3, 0x0b, 0xcd, 0xcb, 0xfe, 0x57, 0x9b, 0x85, 0x7d,
+ 0x1e, 0x8f, 0x90, 0xf5, 0x7d, 0x8c, 0x90, 0x05, 0xac, 0x37, 0x1a, 0x53, 0x4e, 0xc9, 0xba, 0x4b,
+ 0x59, 0x28, 0xbc, 0x3d, 0xf9, 0xb9, 0xd8, 0x75, 0x90, 0xdb, 0xbb, 0xcd, 0x35, 0x9f, 0xfa, 0x54,
+ 0x46, 0xf4, 0xc5, 0x5f, 0x12, 0xdc, 0x34, 0xe6, 0x40, 0xf2, 0xab, 0x3c, 0xeb, 0xf3, 0x9e, 0xcb,
+ 0xc4, 0xdc, 0xbd, 0xd2, 0xa1, 0xf1, 0x26, 0xc9, 0x77, 0xc2, 0x6d, 0x8e, 0xe4, 0x05, 0x54, 0x47,
+ 0xf6, 0xd8, 0x0e, 0x99, 0xa1, 0x75, 0xb4, 0xed, 0xa5, 0xbd, 0xcd, 0xde, 0x3f, 0xf3, 0xf7, 0xde,
+ 0xcb, 0x20, 0xb3, 0x72, 0x35, 0x6d, 0x97, 0x2c, 0x25, 0x21, 0x6f, 0x41, 0x77, 0xa9, 0x87, 0xcc,
+ 0x58, 0xe8, 0x94, 0xb7, 0x97, 0xf6, 0x36, 0x0a, 0xb4, 0xfb, 0xd4, 0x43, 0xf3, 0xa1, 0x50, 0xfe,
+ 0x9e, 0xb6, 0x97, 0xa5, 0xe2, 0x29, 0x0d, 0x03, 0x8e, 0xe1, 0x88, 0xc7, 0x56, 0x82, 0x20, 0xa7,
+ 0x50, 0x77, 0x69, 0xc4, 0xc7, 0xb6, 0xcb, 0x99, 0x51, 0x96, 0xbc, 0x76, 0x21, 0x2f, 0x89, 0x33,
+ 0x37, 0x14, 0x73, 0x35, 0x53, 0xe6, 0xb8, 0xb7, 0x38, 0xc1, 0x66, 0xf8, 0x65, 0x82, 0x91, 0x8b,
+ 0xcc, 0xa8, 0xdc, 0xc9, 0x3e, 0x51, 0x71, 0xb7, 0xec, 0x4c, 0x99, 0x67, 0x67, 0x46, 0xe2, 0x40,
+ 0xcd, 0xc7, 0x68, 0x18, 0x32, 0x9f, 0x19, 0xba, 0x44, 0x3f, 0x29, 0x40, 0xe7, 0xfb, 0x2e, 0x16,
+ 0xc7, 0xcc, 0x67, 0x66, 0x53, 0xa5, 0x21, 0x29, 0x24, 0x97, 0x65, 0xd1, 0x4f, 0x82, 0x9a, 0xdf,
+ 0x17, 0x60, 0x51, 0x09, 0xc8, 0x01, 0x00, 0xe3, 0x74, 0x8c, 0x43, 0xd1, 0x36, 0x75, 0x68, 0x5b,
+ 0x05, 0x19, 0x8f, 0x99, 0x7f, 0x22, 0x62, 0xc5, 0x01, 0x1c, 0x96, 0xac, 0x3a, 0x4b, 0x17, 0xc4,
+ 0x81, 0xb5, 0x20, 0x62, 0xdc, 0x8e, 0x78, 0x60, 0x73, 0xc1, 0x4a, 0x5a, 0x65, 0x2c, 0x48, 0xde,
+ 0xb3, 0x62, 0xde, 0xe0, 0x56, 0x95, 0x1e, 0xc3, 0x61, 0xc9, 0x5a, 0x0d, 0xfe, 0x36, 0x93, 0x0f,
+ 0xb0, 0x82, 0x97, 0xe8, 0x4e, 0xf2, 0xfc, 0xb2, 0xe4, 0xef, 0x14, 0xf3, 0x5f, 0x27, 0x8a, 0x1c,
+ 0x7b, 0x19, 0xe7, 0x4d, 0xa6, 0x0e, 0x65, 0x36, 0x09, 0xbb, 0x3f, 0x34, 0xa8, 0xc8, 0x5a, 0xb6,
+ 0x60, 0x51, 0xf4, 0x62, 0x18, 0x78, 0xb2, 0x1d, 0x15, 0x13, 0x66, 0xd3, 0x76, 0x55, 0xb8, 0x06,
+ 0x07, 0x56, 0x55, 0xb8, 0x06, 0x1e, 0x31, 0xc5, 0x78, 0x89, 0xa0, 0xe8, 0x8c, 0xaa, 0x2a, 0xdb,
+ 0x77, 0x8c, 0xeb, 0x20, 0x3a, 0xa3, 0x6a, 0xd8, 0x6b, 0xae, 0x5a, 0x93, 0x4d, 0x00, 0xc9, 0x70,
+ 0x62, 0x8e, 0x4c, 0x96, 0xd2, 0xb0, 0x24, 0xd5, 0x14, 0x06, 0xf2, 0x00, 0xaa, 0xa3, 0x20, 0x8a,
+ 0xd0, 0x33, 0x2a, 0x1d, 0x6d, 0xbb, 0x66, 0xa9, 0x55, 0xf7, 0x5a, 0x83, 0x5a, 0xd6, 0x94, 0x1d,
+ 0x58, 0x49, 0x9b, 0x31, 0xb4, 0x3d, 0x6f, 0x8c, 0x2c, 0xb9, 0x79, 0x75, 0x6b, 0x39, 0xb5, 0xbf,
+ 0x4a, 0xcc, 0xe4, 0x1d, 0xdc, 0xcb, 0x42, 0x73, 0xdb, 0xde, 0xfa, 0xcf, 0xad, 0xc8, 0x6d, 0xbd,
+ 0xe1, 0xe6, 0x6c, 0x64, 0x00, 0xf7, 0x33, 0x1e, 0x13, 0x43, 0xa8, 0xae, 0xd9, 0xa3, 0xa2, 0xd3,
+ 0xa0, 0x1e, 0x9e, 0x2b, 0x52, 0xb6, 0x13, 0x39, 0xbd, 0x5d, 0x13, 0x6a, 0xe9, 0x45, 0x21, 0x1d,
+ 0xa8, 0x06, 0xde, 0xf0, 0x33, 0xc6, 0xb2, 0x8e, 0x86, 0x59, 0x9f, 0x4d, 0xdb, 0xfa, 0xe0, 0xe0,
+ 0x08, 0x63, 0x4b, 0x0f, 0xbc, 0x23, 0x8c, 0xc9, 0x1a, 0xe8, 0x17, 0xf6, 0xf9, 0x04, 0x65, 0x01,
+ 0x15, 0x2b, 0x59, 0x98, 0x2f, 0xaf, 0x66, 0x2d, 0xed, 0x7a, 0xd6, 0xd2, 0x7e, 0xcd, 0x5a, 0xda,
+ 0xb7, 0x9b, 0x56, 0xe9, 0xfa, 0xa6, 0x55, 0xfa, 0x79, 0xd3, 0x2a, 0x9d, 0x3e, 0xf6, 0x03, 0xfe,
+ 0x69, 0xe2, 0xf4, 0x5c, 0x1a, 0xf6, 0xf7, 0x29, 0x0b, 0x3f, 0x8a, 0x87, 0x4c, 0x6c, 0xcd, 0xeb,
+ 0xe7, 0x5f, 0x35, 0xa7, 0x2a, 0xdf, 0xb4, 0xe7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xa1,
+ 0x56, 0xd4, 0x4f, 0x05, 0x00, 0x00,
}
func (m *GenesisState) Marshal() (dAtA []byte, err error) {
diff --git a/x/wasm/internal/types/genesis.proto b/x/wasm/types/genesis.proto
similarity index 91%
rename from x/wasm/internal/types/genesis.proto
rename to x/wasm/types/genesis.proto
index b7c2df4b45..4c0f3163f1 100644
--- a/x/wasm/internal/types/genesis.proto
+++ b/x/wasm/types/genesis.proto
@@ -2,10 +2,10 @@ syntax = "proto3";
package cosmwasm.wasm.v1beta1;
import "gogoproto/gogo.proto";
-import "x/wasm/internal/types/types.proto";
-import "x/wasm/internal/types/tx.proto";
+import "x/wasm/types/types.proto";
+import "x/wasm/types/tx.proto";
-option go_package = "github.com/CosmWasm/wasmd/x/wasmd/internal/types";
+option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
// GenesisState - genesis state of x/wasm
message GenesisState {
diff --git a/x/wasm/internal/types/genesis_test.go b/x/wasm/types/genesis_test.go
similarity index 100%
rename from x/wasm/internal/types/genesis_test.go
rename to x/wasm/types/genesis_test.go
diff --git a/x/wasm/internal/types/iavl_range_test.go b/x/wasm/types/iavl_range_test.go
similarity index 100%
rename from x/wasm/internal/types/iavl_range_test.go
rename to x/wasm/types/iavl_range_test.go
diff --git a/x/wasm/internal/types/ibc.pb.go b/x/wasm/types/ibc.pb.go
similarity index 85%
rename from x/wasm/internal/types/ibc.pb.go
rename to x/wasm/types/ibc.pb.go
index 6aec2b1bbb..e651ffde14 100644
--- a/x/wasm/internal/types/ibc.pb.go
+++ b/x/wasm/types/ibc.pb.go
@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: x/wasm/internal/types/ibc.proto
+// source: x/wasm/types/ibc.proto
package types
@@ -42,7 +42,7 @@ func (m *MsgIBCSend) Reset() { *m = MsgIBCSend{} }
func (m *MsgIBCSend) String() string { return proto.CompactTextString(m) }
func (*MsgIBCSend) ProtoMessage() {}
func (*MsgIBCSend) Descriptor() ([]byte, []int) {
- return fileDescriptor_9e387a38c39d89d0, []int{0}
+ return fileDescriptor_d9bb1c22229d9ba9, []int{0}
}
func (m *MsgIBCSend) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -80,7 +80,7 @@ func (m *MsgIBCCloseChannel) Reset() { *m = MsgIBCCloseChannel{} }
func (m *MsgIBCCloseChannel) String() string { return proto.CompactTextString(m) }
func (*MsgIBCCloseChannel) ProtoMessage() {}
func (*MsgIBCCloseChannel) Descriptor() ([]byte, []int) {
- return fileDescriptor_9e387a38c39d89d0, []int{1}
+ return fileDescriptor_d9bb1c22229d9ba9, []int{1}
}
func (m *MsgIBCCloseChannel) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -114,32 +114,31 @@ func init() {
proto.RegisterType((*MsgIBCCloseChannel)(nil), "cosmwasm.wasm.v1beta1.MsgIBCCloseChannel")
}
-func init() { proto.RegisterFile("x/wasm/internal/types/ibc.proto", fileDescriptor_9e387a38c39d89d0) }
+func init() { proto.RegisterFile("x/wasm/types/ibc.proto", fileDescriptor_d9bb1c22229d9ba9) }
-var fileDescriptor_9e387a38c39d89d0 = []byte{
- // 342 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0xb1, 0x4e, 0xf3, 0x30,
- 0x14, 0x85, 0x93, 0xaa, 0x7f, 0x7f, 0x61, 0x01, 0x82, 0x88, 0x4a, 0x01, 0x55, 0x4e, 0x95, 0xa9,
- 0x53, 0xdc, 0xaa, 0x1b, 0x13, 0x4a, 0x16, 0x3a, 0x94, 0x21, 0x20, 0x21, 0xb1, 0x54, 0x4e, 0x62,
- 0x39, 0x41, 0xb1, 0x5d, 0xd5, 0x2e, 0x6d, 0x37, 0x1e, 0x81, 0xc7, 0xea, 0xd8, 0x91, 0xa9, 0x82,
- 0xf6, 0x0d, 0x3a, 0x32, 0xa1, 0xb8, 0x29, 0x22, 0x2b, 0x8b, 0xaf, 0x7d, 0xee, 0xe7, 0x2b, 0xdd,
- 0x73, 0x80, 0x33, 0x47, 0x33, 0x2c, 0x19, 0xca, 0xb8, 0x22, 0x13, 0x8e, 0x73, 0xa4, 0x16, 0x63,
- 0x22, 0x51, 0x16, 0xc5, 0xde, 0x78, 0x22, 0x94, 0xb0, 0x9a, 0xb1, 0x90, 0xac, 0x40, 0x3c, 0x7d,
- 0xbc, 0xf4, 0x22, 0xa2, 0x70, 0xef, 0xea, 0x82, 0x0a, 0x2a, 0x34, 0x81, 0x8a, 0xdb, 0x1e, 0x76,
- 0x5f, 0x6b, 0x00, 0x0c, 0x25, 0x1d, 0xf8, 0xc1, 0x3d, 0xe1, 0x89, 0xd5, 0x07, 0xff, 0xe3, 0x14,
- 0x73, 0x4e, 0x72, 0xbb, 0xd6, 0x36, 0x3b, 0x47, 0xfe, 0xe5, 0x6e, 0xed, 0x34, 0x17, 0x98, 0xe5,
- 0xd7, 0xae, 0x14, 0xd3, 0x49, 0x4c, 0x46, 0x65, 0xdf, 0x0d, 0x0f, 0xa4, 0x75, 0x03, 0x4e, 0x55,
- 0xc6, 0x88, 0x98, 0xaa, 0x51, 0x4a, 0x32, 0x9a, 0x2a, 0xbb, 0xde, 0x36, 0x3b, 0xf5, 0xdf, 0x7f,
- 0xab, 0x7d, 0x37, 0x3c, 0x29, 0x85, 0x5b, 0xfd, 0xb6, 0x06, 0xe0, 0xfc, 0x40, 0x14, 0x55, 0x2a,
- 0xcc, 0xc6, 0xf6, 0x3f, 0x3d, 0xa4, 0xb5, 0x5b, 0x3b, 0x76, 0x75, 0xc8, 0x0f, 0xe2, 0x86, 0x67,
- 0xa5, 0xf6, 0x70, 0x90, 0xac, 0x2e, 0xa8, 0x27, 0x58, 0x61, 0xbb, 0xd1, 0x36, 0x3b, 0xc7, 0x7e,
- 0xeb, 0x6b, 0xed, 0xd8, 0x84, 0xc7, 0x22, 0xc9, 0x38, 0x45, 0xcf, 0x52, 0x70, 0x2f, 0xc4, 0xb3,
- 0x21, 0x91, 0x12, 0x53, 0x12, 0x6a, 0xd2, 0x1d, 0x00, 0x6b, 0xef, 0x40, 0x90, 0x0b, 0x49, 0x82,
- 0x72, 0xa9, 0xbf, 0x38, 0xe1, 0xdf, 0x2d, 0x3f, 0xa1, 0xb1, 0xdc, 0x40, 0x73, 0xb5, 0x81, 0xe6,
- 0xc7, 0x06, 0x9a, 0x6f, 0x5b, 0x68, 0xac, 0xb6, 0xd0, 0x78, 0xdf, 0x42, 0xe3, 0xa9, 0x4b, 0x33,
- 0x95, 0x4e, 0x23, 0x2f, 0x16, 0x0c, 0x05, 0x42, 0xb2, 0xc7, 0x22, 0xc6, 0x22, 0xa3, 0x04, 0xcd,
- 0xcb, 0x5a, 0x0d, 0x35, 0x6a, 0xe8, 0x90, 0xfa, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xdb,
- 0x36, 0x0f, 0xf4, 0x01, 0x00, 0x00,
+var fileDescriptor_d9bb1c22229d9ba9 = []byte{
+ // 332 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x91, 0x3f, 0x4f, 0xc2, 0x40,
+ 0x18, 0xc6, 0x5b, 0x82, 0x18, 0x2f, 0x6a, 0xb4, 0x11, 0x53, 0x0d, 0x39, 0x48, 0x07, 0xc3, 0xd4,
+ 0x93, 0xb0, 0x39, 0x99, 0xd6, 0x41, 0x06, 0x96, 0x6a, 0x62, 0xe2, 0x42, 0xae, 0xed, 0xe5, 0x5a,
+ 0xc3, 0xf5, 0x25, 0xdc, 0x21, 0xb2, 0xf9, 0x11, 0xfc, 0x58, 0x8c, 0x8c, 0x4e, 0x44, 0xe1, 0x1b,
+ 0x30, 0x3a, 0x99, 0x1e, 0xc5, 0xc0, 0xea, 0x72, 0x7f, 0x9e, 0xe7, 0x77, 0x6f, 0x72, 0xcf, 0x83,
+ 0xce, 0xdf, 0xc8, 0x98, 0x4a, 0x41, 0xd4, 0x64, 0xc0, 0x24, 0x49, 0xc3, 0xc8, 0x1d, 0x0c, 0x41,
+ 0x81, 0x55, 0x8d, 0x40, 0x8a, 0xdc, 0x71, 0xf5, 0xf2, 0xda, 0x0a, 0x99, 0xa2, 0xad, 0xcb, 0x33,
+ 0x0e, 0x1c, 0x34, 0x41, 0xf2, 0xd3, 0x1a, 0x76, 0xde, 0x4b, 0x08, 0x75, 0x25, 0xef, 0x78, 0xfe,
+ 0x03, 0xcb, 0x62, 0xab, 0x8d, 0xf6, 0xa3, 0x84, 0x66, 0x19, 0xeb, 0xdb, 0xa5, 0x86, 0xd9, 0x3c,
+ 0xf0, 0x2e, 0x56, 0xf3, 0x7a, 0x75, 0x42, 0x45, 0xff, 0xc6, 0x91, 0x30, 0x1a, 0x46, 0xac, 0x57,
+ 0xf8, 0x4e, 0xb0, 0x21, 0xad, 0x5b, 0x74, 0xac, 0x52, 0xc1, 0x60, 0xa4, 0x7a, 0x09, 0x4b, 0x79,
+ 0xa2, 0xec, 0x72, 0xc3, 0x6c, 0x96, 0xb7, 0xdf, 0xee, 0xfa, 0x4e, 0x70, 0x54, 0x08, 0xf7, 0xfa,
+ 0x6e, 0x75, 0xd0, 0xe9, 0x86, 0xc8, 0x77, 0xa9, 0xa8, 0x18, 0xd8, 0x7b, 0x7a, 0x48, 0x6d, 0x35,
+ 0xaf, 0xdb, 0xbb, 0x43, 0xfe, 0x10, 0x27, 0x38, 0x29, 0xb4, 0xc7, 0x8d, 0x64, 0x5d, 0xa3, 0x72,
+ 0x4c, 0x15, 0xb5, 0x2b, 0x0d, 0xb3, 0x79, 0xe8, 0xd5, 0x7e, 0xe6, 0x75, 0x9b, 0x65, 0x11, 0xc4,
+ 0x69, 0xc6, 0xc9, 0x8b, 0x84, 0xcc, 0x0d, 0xe8, 0xb8, 0xcb, 0xa4, 0xa4, 0x9c, 0x05, 0x9a, 0x74,
+ 0x3a, 0xc8, 0x5a, 0x27, 0xe0, 0xf7, 0x41, 0x32, 0xbf, 0xf8, 0xd4, 0x7f, 0x92, 0xf0, 0xee, 0xa6,
+ 0xdf, 0xd8, 0x98, 0x2e, 0xb0, 0x39, 0x5b, 0x60, 0xf3, 0x6b, 0x81, 0xcd, 0x8f, 0x25, 0x36, 0x66,
+ 0x4b, 0x6c, 0x7c, 0x2e, 0xb1, 0xf1, 0x7c, 0xc5, 0x53, 0x95, 0x8c, 0x42, 0x37, 0x02, 0x41, 0x7c,
+ 0x90, 0xe2, 0x29, 0x6f, 0x2f, 0xef, 0x28, 0x26, 0xdb, 0x55, 0x86, 0x15, 0x5d, 0x4d, 0xfb, 0x37,
+ 0x00, 0x00, 0xff, 0xff, 0x2d, 0xfe, 0x78, 0xdd, 0xe1, 0x01, 0x00, 0x00,
}
func (m *MsgIBCSend) Marshal() (dAtA []byte, err error) {
diff --git a/x/wasm/internal/types/ibc.proto b/x/wasm/types/ibc.proto
similarity index 93%
rename from x/wasm/internal/types/ibc.proto
rename to x/wasm/types/ibc.proto
index 672bcb386e..30aa45a92e 100644
--- a/x/wasm/internal/types/ibc.proto
+++ b/x/wasm/types/ibc.proto
@@ -3,7 +3,7 @@ package cosmwasm.wasm.v1beta1;
import "gogoproto/gogo.proto";
-option go_package = "github.com/CosmWasm/wasmd/x/wasmd/internal/types";
+option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
option (gogoproto.goproto_getters_all) = false;
// MsgIBCSend
diff --git a/x/wasm/internal/types/keys.go b/x/wasm/types/keys.go
similarity index 100%
rename from x/wasm/internal/types/keys.go
rename to x/wasm/types/keys.go
diff --git a/x/wasm/internal/types/keys_test.go b/x/wasm/types/keys_test.go
similarity index 100%
rename from x/wasm/internal/types/keys_test.go
rename to x/wasm/types/keys_test.go
diff --git a/x/wasm/internal/types/params.go b/x/wasm/types/params.go
similarity index 100%
rename from x/wasm/internal/types/params.go
rename to x/wasm/types/params.go
diff --git a/x/wasm/internal/types/params_test.go b/x/wasm/types/params_test.go
similarity index 100%
rename from x/wasm/internal/types/params_test.go
rename to x/wasm/types/params_test.go
diff --git a/x/wasm/internal/types/proposal.go b/x/wasm/types/proposal.go
similarity index 100%
rename from x/wasm/internal/types/proposal.go
rename to x/wasm/types/proposal.go
diff --git a/x/wasm/internal/types/proposal.pb.go b/x/wasm/types/proposal.pb.go
similarity index 93%
rename from x/wasm/internal/types/proposal.pb.go
rename to x/wasm/types/proposal.pb.go
index 825380daf0..1de60876a5 100644
--- a/x/wasm/internal/types/proposal.pb.go
+++ b/x/wasm/types/proposal.pb.go
@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: x/wasm/internal/types/proposal.proto
+// source: x/wasm/types/proposal.proto
package types
@@ -48,7 +48,7 @@ type StoreCodeProposal struct {
func (m *StoreCodeProposal) Reset() { *m = StoreCodeProposal{} }
func (*StoreCodeProposal) ProtoMessage() {}
func (*StoreCodeProposal) Descriptor() ([]byte, []int) {
- return fileDescriptor_00b43267813130fb, []int{0}
+ return fileDescriptor_0a371ed62f288510, []int{0}
}
func (m *StoreCodeProposal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -100,7 +100,7 @@ type InstantiateContractProposal struct {
func (m *InstantiateContractProposal) Reset() { *m = InstantiateContractProposal{} }
func (*InstantiateContractProposal) ProtoMessage() {}
func (*InstantiateContractProposal) Descriptor() ([]byte, []int) {
- return fileDescriptor_00b43267813130fb, []int{1}
+ return fileDescriptor_0a371ed62f288510, []int{1}
}
func (m *InstantiateContractProposal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -148,7 +148,7 @@ type MigrateContractProposal struct {
func (m *MigrateContractProposal) Reset() { *m = MigrateContractProposal{} }
func (*MigrateContractProposal) ProtoMessage() {}
func (*MigrateContractProposal) Descriptor() ([]byte, []int) {
- return fileDescriptor_00b43267813130fb, []int{2}
+ return fileDescriptor_0a371ed62f288510, []int{2}
}
func (m *MigrateContractProposal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -192,7 +192,7 @@ type UpdateAdminProposal struct {
func (m *UpdateAdminProposal) Reset() { *m = UpdateAdminProposal{} }
func (*UpdateAdminProposal) ProtoMessage() {}
func (*UpdateAdminProposal) Descriptor() ([]byte, []int) {
- return fileDescriptor_00b43267813130fb, []int{3}
+ return fileDescriptor_0a371ed62f288510, []int{3}
}
func (m *UpdateAdminProposal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -234,7 +234,7 @@ type ClearAdminProposal struct {
func (m *ClearAdminProposal) Reset() { *m = ClearAdminProposal{} }
func (*ClearAdminProposal) ProtoMessage() {}
func (*ClearAdminProposal) Descriptor() ([]byte, []int) {
- return fileDescriptor_00b43267813130fb, []int{4}
+ return fileDescriptor_0a371ed62f288510, []int{4}
}
func (m *ClearAdminProposal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -276,7 +276,7 @@ type PinCodesProposal struct {
func (m *PinCodesProposal) Reset() { *m = PinCodesProposal{} }
func (*PinCodesProposal) ProtoMessage() {}
func (*PinCodesProposal) Descriptor() ([]byte, []int) {
- return fileDescriptor_00b43267813130fb, []int{5}
+ return fileDescriptor_0a371ed62f288510, []int{5}
}
func (m *PinCodesProposal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -318,7 +318,7 @@ type UnpinCodesProposal struct {
func (m *UnpinCodesProposal) Reset() { *m = UnpinCodesProposal{} }
func (*UnpinCodesProposal) ProtoMessage() {}
func (*UnpinCodesProposal) Descriptor() ([]byte, []int) {
- return fileDescriptor_00b43267813130fb, []int{6}
+ return fileDescriptor_0a371ed62f288510, []int{6}
}
func (m *UnpinCodesProposal) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -357,59 +357,56 @@ func init() {
proto.RegisterType((*UnpinCodesProposal)(nil), "cosmwasm.wasm.v1beta1.UnpinCodesProposal")
}
-func init() {
- proto.RegisterFile("x/wasm/internal/types/proposal.proto", fileDescriptor_00b43267813130fb)
-}
-
-var fileDescriptor_00b43267813130fb = []byte{
- // 742 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0xcb, 0x6e, 0xe3, 0x36,
- 0x14, 0xb5, 0xe2, 0xf8, 0x11, 0xda, 0x68, 0x5d, 0xd5, 0x49, 0xd5, 0xb4, 0x90, 0x5c, 0xa5, 0x28,
- 0xbc, 0xa9, 0x94, 0xa4, 0x40, 0x5f, 0x40, 0x17, 0x96, 0xbb, 0xc9, 0xc2, 0x40, 0xa0, 0x20, 0x0d,
- 0x90, 0x8d, 0x41, 0x4b, 0x8c, 0xc2, 0x56, 0x22, 0x05, 0x91, 0xae, 0xe3, 0xbf, 0xe8, 0x07, 0xf4,
- 0x03, 0x82, 0x6e, 0x8a, 0xfe, 0x45, 0x96, 0x59, 0xa6, 0x1b, 0xcd, 0xc4, 0xd9, 0xcc, 0xda, 0xcb,
- 0x59, 0x0d, 0x48, 0xca, 0x1e, 0x67, 0x10, 0x0c, 0x02, 0xcc, 0x03, 0x98, 0x8d, 0xe4, 0xcb, 0x7b,
- 0x78, 0xcf, 0xe1, 0xb9, 0xd7, 0x22, 0xf8, 0xfa, 0xc2, 0x9d, 0x40, 0x96, 0xb8, 0x98, 0x70, 0x94,
- 0x11, 0x18, 0xbb, 0x7c, 0x9a, 0x22, 0xe6, 0xa6, 0x19, 0x4d, 0x29, 0x83, 0xb1, 0x93, 0x66, 0x94,
- 0x53, 0x7d, 0x33, 0xa0, 0x2c, 0x11, 0x38, 0x47, 0x3e, 0xfe, 0xdc, 0x1b, 0x21, 0x0e, 0xf7, 0xb6,
- 0xdb, 0x11, 0x8d, 0xa8, 0x44, 0xb8, 0xe2, 0x97, 0x02, 0x6f, 0x9b, 0x02, 0x4c, 0x99, 0x3b, 0x82,
- 0x0c, 0xb9, 0x05, 0xd4, 0x0d, 0x28, 0x26, 0x45, 0xfe, 0xab, 0x87, 0x29, 0xe5, 0x53, 0x41, 0xec,
- 0xcb, 0x35, 0xf0, 0xc9, 0x11, 0xa7, 0x19, 0xea, 0xd3, 0x10, 0x1d, 0x16, 0x5a, 0xf4, 0x36, 0xa8,
- 0x70, 0xcc, 0x63, 0x64, 0x68, 0x1d, 0xad, 0xbb, 0xe1, 0xab, 0x40, 0xef, 0x80, 0x46, 0x88, 0x58,
- 0x90, 0xe1, 0x94, 0x63, 0x4a, 0x8c, 0x35, 0x99, 0x5b, 0x5d, 0xd2, 0x37, 0x41, 0x35, 0x1b, 0x93,
- 0x21, 0x64, 0x46, 0x59, 0x6d, 0xcc, 0xc6, 0xa4, 0xc7, 0xf4, 0xef, 0xc1, 0x47, 0x42, 0xc7, 0x70,
- 0x34, 0xe5, 0x68, 0x18, 0xd0, 0x10, 0x19, 0xeb, 0x1d, 0xad, 0xdb, 0xf4, 0x5a, 0xb3, 0xdc, 0x6a,
- 0x9e, 0xf4, 0x8e, 0x06, 0xde, 0x94, 0x4b, 0x01, 0x7e, 0x53, 0xe0, 0x16, 0x91, 0xbe, 0x05, 0xaa,
- 0x8c, 0x8e, 0xb3, 0x00, 0x19, 0x15, 0x59, 0xae, 0x88, 0x74, 0x03, 0xd4, 0x46, 0x63, 0x1c, 0x87,
- 0x28, 0x33, 0xaa, 0x32, 0xb1, 0x08, 0xf5, 0x53, 0xb0, 0x85, 0x09, 0xe3, 0x90, 0x70, 0x0c, 0x39,
- 0x1a, 0xa6, 0x28, 0x4b, 0x30, 0x63, 0x42, 0x6d, 0xad, 0xa3, 0x75, 0x1b, 0xfb, 0x3b, 0xce, 0x83,
- 0xfe, 0x3a, 0xbd, 0x20, 0x40, 0x8c, 0xf5, 0x29, 0x39, 0xc3, 0x91, 0xbf, 0xb9, 0x52, 0xe2, 0x70,
- 0x59, 0xc1, 0xfe, 0x7f, 0x0d, 0x7c, 0x71, 0xf0, 0x32, 0xd3, 0xa7, 0x84, 0x67, 0x30, 0xe0, 0xef,
- 0xca, 0xb4, 0x36, 0xa8, 0xc0, 0x30, 0xc1, 0x44, 0x7a, 0xb5, 0xe1, 0xab, 0x40, 0xdf, 0x01, 0x35,
- 0x61, 0xe0, 0x10, 0x87, 0xd2, 0x93, 0x75, 0x0f, 0xcc, 0x72, 0xab, 0x2a, 0xdc, 0x3a, 0xf8, 0xd5,
- 0xaf, 0x8a, 0xd4, 0x41, 0x28, 0xb6, 0xc6, 0x70, 0x84, 0xe2, 0xc2, 0x1d, 0x15, 0xe8, 0x3f, 0x80,
- 0x3a, 0x26, 0x98, 0x0f, 0x13, 0x16, 0x49, 0x37, 0x9a, 0xde, 0x97, 0xcf, 0x73, 0xcb, 0x40, 0x24,
- 0xa0, 0x21, 0x26, 0x91, 0xfb, 0x3b, 0xa3, 0xc4, 0xf1, 0xe1, 0x64, 0x80, 0x18, 0x83, 0x11, 0xf2,
- 0x6b, 0x02, 0x3d, 0x60, 0x91, 0x0e, 0x41, 0xe5, 0x6c, 0x4c, 0x42, 0x66, 0xd4, 0x3b, 0xe5, 0x6e,
- 0x63, 0xff, 0x73, 0x47, 0x8d, 0x9d, 0x23, 0xc6, 0x6e, 0xe9, 0x60, 0x9f, 0x62, 0xe2, 0xed, 0x5e,
- 0xe5, 0x56, 0xe9, 0x9f, 0x27, 0x56, 0x37, 0xc2, 0xfc, 0x7c, 0x3c, 0x72, 0x02, 0x9a, 0xb8, 0xc5,
- 0x8c, 0xaa, 0xd7, 0xb7, 0x2c, 0xfc, 0xa3, 0x98, 0x3f, 0xb1, 0x81, 0xf9, 0xaa, 0xb2, 0xfd, 0x4c,
- 0x03, 0x9f, 0x0d, 0x70, 0x94, 0xbd, 0x07, 0x5f, 0xb7, 0x41, 0x3d, 0x28, 0x28, 0x0a, 0x6b, 0x97,
- 0xf1, 0xe3, 0xdc, 0xfd, 0x05, 0x34, 0x12, 0x25, 0x55, 0x5a, 0x59, 0x7d, 0x84, 0x95, 0xa0, 0xd8,
- 0x30, 0x60, 0x91, 0xfd, 0xb7, 0x06, 0x3e, 0x3d, 0x4e, 0x43, 0xc8, 0x51, 0x4f, 0x74, 0xf4, 0x8d,
- 0x8f, 0xb9, 0x07, 0x36, 0x08, 0x9a, 0x0c, 0xd5, 0xac, 0xc8, 0x93, 0x7a, 0xed, 0x79, 0x6e, 0xb5,
- 0xa6, 0x30, 0x89, 0x7f, 0xb6, 0x97, 0x29, 0xdb, 0xaf, 0x13, 0x34, 0x91, 0x94, 0xaf, 0xb3, 0xc0,
- 0x3e, 0x07, 0x7a, 0x3f, 0x46, 0x30, 0x7b, 0x3b, 0xe2, 0x56, 0x99, 0xca, 0xaf, 0x30, 0xfd, 0xab,
- 0x81, 0xd6, 0x21, 0x26, 0xc2, 0x5d, 0xb6, 0x24, 0xfa, 0xe6, 0x1e, 0x91, 0xd7, 0x9a, 0xe7, 0x56,
- 0x53, 0x9d, 0x44, 0x2e, 0xdb, 0x0b, 0xea, 0x1f, 0x1f, 0xa0, 0xf6, 0xb6, 0xe6, 0xb9, 0xa5, 0x2b,
- 0xf4, 0x4a, 0xd2, 0xbe, 0x2f, 0xe9, 0x27, 0x21, 0x49, 0xf6, 0x58, 0x0c, 0x46, 0xb9, 0xbb, 0xee,
- 0x99, 0xb3, 0xdc, 0xaa, 0xa9, 0x26, 0xb3, 0x79, 0x6e, 0x7d, 0xac, 0x2a, 0x2c, 0x40, 0xb6, 0x5f,
- 0x53, 0x8d, 0x67, 0xf6, 0x7f, 0x1a, 0xd0, 0x8f, 0x49, 0xfa, 0x21, 0x69, 0xf6, 0x7e, 0xbb, 0xba,
- 0x35, 0x4b, 0x37, 0xb7, 0x66, 0xe9, 0x72, 0x66, 0x6a, 0x57, 0x33, 0x53, 0xbb, 0x9e, 0x99, 0xda,
- 0xd3, 0x99, 0xa9, 0xfd, 0x75, 0x67, 0x96, 0xae, 0xef, 0xcc, 0xd2, 0xcd, 0x9d, 0x59, 0x3a, 0xdd,
- 0x5d, 0xf9, 0xc3, 0xf6, 0x29, 0x4b, 0x4e, 0xc4, 0xb5, 0x21, 0xbe, 0x90, 0xa1, 0x7b, 0x51, 0xbc,
- 0xef, 0x5f, 0x22, 0xa3, 0xaa, 0xbc, 0x3f, 0xbe, 0x7b, 0x11, 0x00, 0x00, 0xff, 0xff, 0x98, 0x84,
- 0x18, 0xe8, 0xd7, 0x06, 0x00, 0x00,
+func init() { proto.RegisterFile("x/wasm/types/proposal.proto", fileDescriptor_0a371ed62f288510) }
+
+var fileDescriptor_0a371ed62f288510 = []byte{
+ // 734 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x95, 0x4d, 0x6b, 0xdb, 0x48,
+ 0x18, 0xc7, 0xad, 0x38, 0x7e, 0xc9, 0xd8, 0xec, 0x7a, 0xb5, 0x4e, 0x56, 0x9b, 0x2c, 0x92, 0x51,
+ 0x20, 0xf8, 0xb2, 0xd2, 0x26, 0x0b, 0xfb, 0x06, 0x7b, 0xb0, 0xbc, 0x97, 0xc0, 0x1a, 0x82, 0x42,
+ 0x08, 0xe4, 0x62, 0xc6, 0xd2, 0x44, 0x99, 0xd6, 0x9a, 0x11, 0x9a, 0x71, 0x5d, 0x7f, 0x8b, 0x7e,
+ 0x80, 0x7e, 0x80, 0xd0, 0x4b, 0xe9, 0xb7, 0xc8, 0x31, 0xc7, 0xf4, 0xa2, 0x36, 0xce, 0xa5, 0x67,
+ 0x1f, 0x7b, 0x2a, 0x33, 0x23, 0xbb, 0x4e, 0x09, 0x25, 0xd0, 0x17, 0xe8, 0x45, 0xf6, 0xa3, 0xff,
+ 0x33, 0xcf, 0xff, 0x99, 0xdf, 0x3c, 0xf6, 0x80, 0xad, 0xc7, 0xee, 0x18, 0xb2, 0xd8, 0xe5, 0x93,
+ 0x04, 0x31, 0x37, 0x49, 0x69, 0x42, 0x19, 0x1c, 0x3a, 0x49, 0x4a, 0x39, 0xd5, 0xd7, 0x03, 0xca,
+ 0x62, 0x21, 0x3b, 0xf2, 0xf1, 0x68, 0x77, 0x80, 0x38, 0xdc, 0xdd, 0x6c, 0x46, 0x34, 0xa2, 0x32,
+ 0xc3, 0x15, 0xdf, 0x54, 0xf2, 0xa6, 0x29, 0x92, 0x29, 0x73, 0x07, 0x90, 0x21, 0x37, 0x4f, 0x75,
+ 0x03, 0x8a, 0x49, 0xae, 0x1b, 0xb7, 0x9c, 0xe4, 0x53, 0x29, 0xf6, 0xf9, 0x0a, 0xf8, 0xe1, 0x90,
+ 0xd3, 0x14, 0x75, 0x69, 0x88, 0x0e, 0xf2, 0x16, 0xf4, 0x26, 0x28, 0x71, 0xcc, 0x87, 0xc8, 0xd0,
+ 0x5a, 0x5a, 0x7b, 0xcd, 0x57, 0x81, 0xde, 0x02, 0xb5, 0x10, 0xb1, 0x20, 0xc5, 0x09, 0xc7, 0x94,
+ 0x18, 0x2b, 0x52, 0x5b, 0x7e, 0xa5, 0xaf, 0x83, 0x72, 0x3a, 0x22, 0x7d, 0xc8, 0x8c, 0xa2, 0x5a,
+ 0x98, 0x8e, 0x48, 0x87, 0xe9, 0x7f, 0x80, 0xef, 0x84, 0x7d, 0x7f, 0x30, 0xe1, 0xa8, 0x1f, 0xd0,
+ 0x10, 0x19, 0xab, 0x2d, 0xad, 0x5d, 0xf7, 0x1a, 0xd3, 0xcc, 0xaa, 0x1f, 0x77, 0x0e, 0x7b, 0xde,
+ 0x84, 0xcb, 0x06, 0xfc, 0xba, 0xc8, 0x9b, 0x47, 0xfa, 0x06, 0x28, 0x33, 0x3a, 0x4a, 0x03, 0x64,
+ 0x94, 0x64, 0xb9, 0x3c, 0xd2, 0x0d, 0x50, 0x19, 0x8c, 0xf0, 0x30, 0x44, 0xa9, 0x51, 0x96, 0xc2,
+ 0x3c, 0xd4, 0x4f, 0xc0, 0x06, 0x26, 0x8c, 0x43, 0xc2, 0x31, 0xe4, 0xa8, 0x9f, 0xa0, 0x34, 0xc6,
+ 0x8c, 0x89, 0x6e, 0x2b, 0x2d, 0xad, 0x5d, 0xdb, 0xdb, 0x76, 0xee, 0xc4, 0xea, 0x74, 0x82, 0x00,
+ 0x31, 0xd6, 0xa5, 0xe4, 0x14, 0x47, 0xfe, 0xfa, 0x52, 0x89, 0x83, 0x45, 0x05, 0xfb, 0xe5, 0x0a,
+ 0xd8, 0xda, 0x7f, 0xaf, 0x74, 0x29, 0xe1, 0x29, 0x0c, 0xf8, 0x97, 0x82, 0xd6, 0x04, 0x25, 0x18,
+ 0xc6, 0x98, 0x48, 0x56, 0x6b, 0xbe, 0x0a, 0xf4, 0x6d, 0x50, 0x11, 0x00, 0xfb, 0x38, 0x94, 0x4c,
+ 0x56, 0x3d, 0x30, 0xcd, 0xac, 0xb2, 0xa0, 0xb5, 0xff, 0x9f, 0x5f, 0x16, 0xd2, 0x7e, 0x28, 0x96,
+ 0x0e, 0xe1, 0x00, 0x0d, 0x73, 0x3a, 0x2a, 0xd0, 0xff, 0x04, 0x55, 0x4c, 0x30, 0xef, 0xc7, 0x2c,
+ 0x92, 0x34, 0xea, 0xde, 0x2f, 0x6f, 0x33, 0xcb, 0x40, 0x24, 0xa0, 0x21, 0x26, 0x91, 0xfb, 0x80,
+ 0x51, 0xe2, 0xf8, 0x70, 0xdc, 0x43, 0x8c, 0xc1, 0x08, 0xf9, 0x15, 0x91, 0xdd, 0x63, 0x91, 0x0e,
+ 0x41, 0xe9, 0x74, 0x44, 0x42, 0x66, 0x54, 0x5b, 0xc5, 0x76, 0x6d, 0xef, 0x67, 0x47, 0x4d, 0x9b,
+ 0x23, 0xa6, 0x6d, 0x41, 0xb0, 0x4b, 0x31, 0xf1, 0x7e, 0xbb, 0xc8, 0xac, 0xc2, 0xb3, 0x57, 0x56,
+ 0x3b, 0xc2, 0xfc, 0x6c, 0x34, 0x70, 0x02, 0x1a, 0xbb, 0xf9, 0x68, 0xaa, 0x8f, 0x5f, 0x59, 0xf8,
+ 0x30, 0x9f, 0x3f, 0xb1, 0x80, 0xf9, 0xaa, 0xb2, 0xfd, 0x46, 0x03, 0x3f, 0xf5, 0x70, 0x94, 0x7e,
+ 0x05, 0xae, 0x9b, 0xa0, 0x1a, 0xe4, 0x16, 0x39, 0xda, 0x45, 0x7c, 0x3f, 0xba, 0xff, 0x82, 0x5a,
+ 0xac, 0x5a, 0x95, 0x28, 0xcb, 0xf7, 0x40, 0x09, 0xf2, 0x05, 0x3d, 0x16, 0xd9, 0x4f, 0x35, 0xf0,
+ 0xe3, 0x51, 0x12, 0x42, 0x8e, 0x3a, 0xe2, 0x44, 0x3f, 0x79, 0x9b, 0xbb, 0x60, 0x8d, 0xa0, 0x71,
+ 0x5f, 0xcd, 0x8a, 0xdc, 0xa9, 0xd7, 0x9c, 0x65, 0x56, 0x63, 0x02, 0xe3, 0xe1, 0x3f, 0xf6, 0x42,
+ 0xb2, 0xfd, 0x2a, 0x41, 0x63, 0x69, 0xf9, 0x31, 0x04, 0xf6, 0x19, 0xd0, 0xbb, 0x43, 0x04, 0xd3,
+ 0xcf, 0xd3, 0xdc, 0xb2, 0x53, 0xf1, 0x03, 0xa7, 0xe7, 0x1a, 0x68, 0x1c, 0x60, 0x22, 0xe8, 0xb2,
+ 0x85, 0xd1, 0xce, 0x2d, 0x23, 0xaf, 0x31, 0xcb, 0xac, 0xba, 0xda, 0x89, 0x7c, 0x6d, 0xcf, 0xad,
+ 0xff, 0xba, 0xc3, 0xda, 0xdb, 0x98, 0x65, 0x96, 0xae, 0xb2, 0x97, 0x44, 0xfb, 0x76, 0x4b, 0x7f,
+ 0x8b, 0x96, 0xe4, 0x19, 0x8b, 0xc1, 0x28, 0xb6, 0x57, 0x3d, 0x73, 0x9a, 0x59, 0x15, 0x75, 0xc8,
+ 0x6c, 0x96, 0x59, 0xdf, 0xab, 0x0a, 0xf3, 0x24, 0xdb, 0xaf, 0xa8, 0x83, 0x67, 0xf6, 0x0b, 0x0d,
+ 0xe8, 0x47, 0x24, 0xf9, 0x96, 0x7a, 0xf6, 0xfe, 0xbf, 0xb8, 0x36, 0x0b, 0x57, 0xd7, 0x66, 0xe1,
+ 0x7c, 0x6a, 0x6a, 0x17, 0x53, 0x53, 0xbb, 0x9c, 0x9a, 0xda, 0xeb, 0xa9, 0xa9, 0x3d, 0xb9, 0x31,
+ 0x0b, 0x97, 0x37, 0x66, 0xe1, 0xea, 0xc6, 0x2c, 0x9c, 0xec, 0x2c, 0xfd, 0x60, 0xbb, 0x94, 0xc5,
+ 0xc7, 0xe2, 0xb6, 0x10, 0xff, 0x90, 0xa1, 0xbb, 0x7c, 0x75, 0x0c, 0xca, 0xf2, 0xd6, 0xf8, 0xfd,
+ 0x5d, 0x00, 0x00, 0x00, 0xff, 0xff, 0x11, 0xcc, 0xe0, 0x60, 0xbb, 0x06, 0x00, 0x00,
}
func (this *StoreCodeProposal) Equal(that interface{}) bool {
diff --git a/x/wasm/internal/types/proposal.proto b/x/wasm/types/proposal.proto
similarity index 97%
rename from x/wasm/internal/types/proposal.proto
rename to x/wasm/types/proposal.proto
index e87aafbf40..876b1e41e9 100644
--- a/x/wasm/internal/types/proposal.proto
+++ b/x/wasm/types/proposal.proto
@@ -3,9 +3,9 @@ package cosmwasm.wasm.v1beta1;
import "gogoproto/gogo.proto";
import "cosmos/base/v1beta1/coin.proto";
-import "x/wasm/internal/types/types.proto";
+import "x/wasm/types/types.proto";
-option go_package = "github.com/CosmWasm/wasmd/x/wasmd/internal/types";
+option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
option (gogoproto.goproto_stringer_all) = false;
option (gogoproto.goproto_getters_all) = false;
option (gogoproto.equal_all) = true;
diff --git a/x/wasm/internal/types/proposal_test.go b/x/wasm/types/proposal_test.go
similarity index 100%
rename from x/wasm/internal/types/proposal_test.go
rename to x/wasm/types/proposal_test.go
diff --git a/x/wasm/internal/types/query.pb.go b/x/wasm/types/query.pb.go
similarity index 93%
rename from x/wasm/internal/types/query.pb.go
rename to x/wasm/types/query.pb.go
index b6837e739f..04e5a8584f 100644
--- a/x/wasm/internal/types/query.pb.go
+++ b/x/wasm/types/query.pb.go
@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: x/wasm/internal/types/query.proto
+// source: x/wasm/types/query.proto
package types
@@ -43,7 +43,7 @@ func (m *QueryContractInfoRequest) Reset() { *m = QueryContractInfoReque
func (m *QueryContractInfoRequest) String() string { return proto.CompactTextString(m) }
func (*QueryContractInfoRequest) ProtoMessage() {}
func (*QueryContractInfoRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{0}
+ return fileDescriptor_05d4eea78dee184d, []int{0}
}
func (m *QueryContractInfoRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -83,7 +83,7 @@ func (m *QueryContractInfoResponse) Reset() { *m = QueryContractInfoResp
func (m *QueryContractInfoResponse) String() string { return proto.CompactTextString(m) }
func (*QueryContractInfoResponse) ProtoMessage() {}
func (*QueryContractInfoResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{1}
+ return fileDescriptor_05d4eea78dee184d, []int{1}
}
func (m *QueryContractInfoResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -124,7 +124,7 @@ func (m *QueryContractHistoryRequest) Reset() { *m = QueryContractHistor
func (m *QueryContractHistoryRequest) String() string { return proto.CompactTextString(m) }
func (*QueryContractHistoryRequest) ProtoMessage() {}
func (*QueryContractHistoryRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{2}
+ return fileDescriptor_05d4eea78dee184d, []int{2}
}
func (m *QueryContractHistoryRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -164,7 +164,7 @@ func (m *QueryContractHistoryResponse) Reset() { *m = QueryContractHisto
func (m *QueryContractHistoryResponse) String() string { return proto.CompactTextString(m) }
func (*QueryContractHistoryResponse) ProtoMessage() {}
func (*QueryContractHistoryResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{3}
+ return fileDescriptor_05d4eea78dee184d, []int{3}
}
func (m *QueryContractHistoryResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -204,7 +204,7 @@ func (m *QueryContractsByCodeRequest) Reset() { *m = QueryContractsByCod
func (m *QueryContractsByCodeRequest) String() string { return proto.CompactTextString(m) }
func (*QueryContractsByCodeRequest) ProtoMessage() {}
func (*QueryContractsByCodeRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{4}
+ return fileDescriptor_05d4eea78dee184d, []int{4}
}
func (m *QueryContractsByCodeRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -243,7 +243,7 @@ func (m *ContractInfoWithAddress) Reset() { *m = ContractInfoWithAddress
func (m *ContractInfoWithAddress) String() string { return proto.CompactTextString(m) }
func (*ContractInfoWithAddress) ProtoMessage() {}
func (*ContractInfoWithAddress) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{5}
+ return fileDescriptor_05d4eea78dee184d, []int{5}
}
func (m *ContractInfoWithAddress) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -283,7 +283,7 @@ func (m *QueryContractsByCodeResponse) Reset() { *m = QueryContractsByCo
func (m *QueryContractsByCodeResponse) String() string { return proto.CompactTextString(m) }
func (*QueryContractsByCodeResponse) ProtoMessage() {}
func (*QueryContractsByCodeResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{6}
+ return fileDescriptor_05d4eea78dee184d, []int{6}
}
func (m *QueryContractsByCodeResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -324,7 +324,7 @@ func (m *QueryAllContractStateRequest) Reset() { *m = QueryAllContractSt
func (m *QueryAllContractStateRequest) String() string { return proto.CompactTextString(m) }
func (*QueryAllContractStateRequest) ProtoMessage() {}
func (*QueryAllContractStateRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{7}
+ return fileDescriptor_05d4eea78dee184d, []int{7}
}
func (m *QueryAllContractStateRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -364,7 +364,7 @@ func (m *QueryAllContractStateResponse) Reset() { *m = QueryAllContractS
func (m *QueryAllContractStateResponse) String() string { return proto.CompactTextString(m) }
func (*QueryAllContractStateResponse) ProtoMessage() {}
func (*QueryAllContractStateResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{8}
+ return fileDescriptor_05d4eea78dee184d, []int{8}
}
func (m *QueryAllContractStateResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -404,7 +404,7 @@ func (m *QueryRawContractStateRequest) Reset() { *m = QueryRawContractSt
func (m *QueryRawContractStateRequest) String() string { return proto.CompactTextString(m) }
func (*QueryRawContractStateRequest) ProtoMessage() {}
func (*QueryRawContractStateRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{9}
+ return fileDescriptor_05d4eea78dee184d, []int{9}
}
func (m *QueryRawContractStateRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -443,7 +443,7 @@ func (m *QueryRawContractStateResponse) Reset() { *m = QueryRawContractS
func (m *QueryRawContractStateResponse) String() string { return proto.CompactTextString(m) }
func (*QueryRawContractStateResponse) ProtoMessage() {}
func (*QueryRawContractStateResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{10}
+ return fileDescriptor_05d4eea78dee184d, []int{10}
}
func (m *QueryRawContractStateResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -484,7 +484,7 @@ func (m *QuerySmartContractStateRequest) Reset() { *m = QuerySmartContra
func (m *QuerySmartContractStateRequest) String() string { return proto.CompactTextString(m) }
func (*QuerySmartContractStateRequest) ProtoMessage() {}
func (*QuerySmartContractStateRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{11}
+ return fileDescriptor_05d4eea78dee184d, []int{11}
}
func (m *QuerySmartContractStateRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -523,7 +523,7 @@ func (m *QuerySmartContractStateResponse) Reset() { *m = QuerySmartContr
func (m *QuerySmartContractStateResponse) String() string { return proto.CompactTextString(m) }
func (*QuerySmartContractStateResponse) ProtoMessage() {}
func (*QuerySmartContractStateResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{12}
+ return fileDescriptor_05d4eea78dee184d, []int{12}
}
func (m *QuerySmartContractStateResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -561,7 +561,7 @@ func (m *QueryCodeRequest) Reset() { *m = QueryCodeRequest{} }
func (m *QueryCodeRequest) String() string { return proto.CompactTextString(m) }
func (*QueryCodeRequest) ProtoMessage() {}
func (*QueryCodeRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{13}
+ return fileDescriptor_05d4eea78dee184d, []int{13}
}
func (m *QueryCodeRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -603,7 +603,7 @@ func (m *CodeInfoResponse) Reset() { *m = CodeInfoResponse{} }
func (m *CodeInfoResponse) String() string { return proto.CompactTextString(m) }
func (*CodeInfoResponse) ProtoMessage() {}
func (*CodeInfoResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{14}
+ return fileDescriptor_05d4eea78dee184d, []int{14}
}
func (m *CodeInfoResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -642,7 +642,7 @@ func (m *QueryCodeResponse) Reset() { *m = QueryCodeResponse{} }
func (m *QueryCodeResponse) String() string { return proto.CompactTextString(m) }
func (*QueryCodeResponse) ProtoMessage() {}
func (*QueryCodeResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{15}
+ return fileDescriptor_05d4eea78dee184d, []int{15}
}
func (m *QueryCodeResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -681,7 +681,7 @@ func (m *QueryCodesRequest) Reset() { *m = QueryCodesRequest{} }
func (m *QueryCodesRequest) String() string { return proto.CompactTextString(m) }
func (*QueryCodesRequest) ProtoMessage() {}
func (*QueryCodesRequest) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{16}
+ return fileDescriptor_05d4eea78dee184d, []int{16}
}
func (m *QueryCodesRequest) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -721,7 +721,7 @@ func (m *QueryCodesResponse) Reset() { *m = QueryCodesResponse{} }
func (m *QueryCodesResponse) String() string { return proto.CompactTextString(m) }
func (*QueryCodesResponse) ProtoMessage() {}
func (*QueryCodesResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_845473e9a3330642, []int{17}
+ return fileDescriptor_05d4eea78dee184d, []int{17}
}
func (m *QueryCodesResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -771,80 +771,80 @@ func init() {
proto.RegisterType((*QueryCodesResponse)(nil), "cosmwasm.wasm.v1beta1.QueryCodesResponse")
}
-func init() { proto.RegisterFile("x/wasm/internal/types/query.proto", fileDescriptor_845473e9a3330642) }
+func init() { proto.RegisterFile("x/wasm/types/query.proto", fileDescriptor_05d4eea78dee184d) }
-var fileDescriptor_845473e9a3330642 = []byte{
- // 1116 bytes of a gzipped FileDescriptorProto
+var fileDescriptor_05d4eea78dee184d = []byte{
+ // 1107 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x97, 0xcf, 0x6f, 0x1b, 0x45,
- 0x14, 0xc7, 0x3d, 0xad, 0xf3, 0xc3, 0xd3, 0x14, 0xc2, 0xa8, 0x50, 0x63, 0xdc, 0x75, 0x58, 0x50,
- 0xeb, 0x16, 0x69, 0x37, 0x89, 0x53, 0x04, 0xe5, 0x54, 0xa7, 0x40, 0x2a, 0x51, 0x7e, 0x6c, 0x84,
- 0x22, 0xe8, 0x21, 0x1a, 0xef, 0x4e, 0xed, 0x45, 0xf6, 0x8e, 0xbb, 0x33, 0x26, 0xb1, 0xa2, 0x50,
- 0xc4, 0x85, 0x13, 0x02, 0x89, 0x23, 0x17, 0x0e, 0x1c, 0x50, 0x81, 0x7b, 0x8f, 0x1c, 0x38, 0xe4,
- 0x18, 0x89, 0x0b, 0x27, 0x0b, 0x1c, 0x84, 0x50, 0xfe, 0x84, 0x9e, 0xd0, 0xcc, 0xce, 0x26, 0xbb,
- 0x8e, 0xd7, 0xeb, 0x20, 0x0b, 0x2e, 0xc9, 0xae, 0xfd, 0xde, 0x9b, 0xcf, 0xfb, 0xbe, 0x99, 0xf7,
- 0xc6, 0xf0, 0xf9, 0x6d, 0x73, 0x0b, 0xb3, 0x96, 0xe9, 0x7a, 0x9c, 0xf8, 0x1e, 0x6e, 0x9a, 0xbc,
- 0xdb, 0x26, 0xcc, 0xbc, 0xdf, 0x21, 0x7e, 0xd7, 0x68, 0xfb, 0x94, 0x53, 0xf4, 0xb4, 0x4d, 0x59,
- 0x4b, 0x18, 0x19, 0xf2, 0xcf, 0xc7, 0x4b, 0x35, 0xc2, 0xf1, 0x52, 0xe1, 0x42, 0x9d, 0xd6, 0xa9,
- 0xb4, 0x30, 0xc5, 0x53, 0x60, 0x5c, 0x48, 0x88, 0x27, 0xff, 0x2a, 0x93, 0x62, 0x9d, 0xd2, 0x7a,
- 0x93, 0x98, 0xb8, 0xed, 0x9a, 0xd8, 0xf3, 0x28, 0xc7, 0xdc, 0xa5, 0x5e, 0xf8, 0xed, 0x35, 0xb1,
- 0x1a, 0x65, 0x66, 0x0d, 0x33, 0x12, 0x60, 0x98, 0x6a, 0x45, 0xb3, 0x8d, 0xeb, 0xae, 0x27, 0x8d,
- 0x03, 0x5b, 0x7d, 0x05, 0xe6, 0xdf, 0x13, 0x16, 0xab, 0xd4, 0xe3, 0x3e, 0xb6, 0xf9, 0x6d, 0xef,
- 0x1e, 0xb5, 0xc8, 0xfd, 0x0e, 0x61, 0x1c, 0xe5, 0xe1, 0x0c, 0x76, 0x1c, 0x9f, 0x30, 0x96, 0x07,
- 0x0b, 0xa0, 0x9c, 0xb3, 0xc2, 0x57, 0xfd, 0x4b, 0x00, 0x9f, 0x1d, 0xe2, 0xc6, 0xda, 0xd4, 0x63,
- 0x24, 0xd9, 0x0f, 0x59, 0xf0, 0xbc, 0xad, 0x3c, 0x36, 0x5d, 0xef, 0x1e, 0xcd, 0x9f, 0x59, 0x00,
- 0xe5, 0x73, 0xcb, 0x2f, 0x18, 0x43, 0xf5, 0x31, 0xa2, 0xd1, 0xab, 0xb3, 0xfb, 0xbd, 0x12, 0x38,
- 0xec, 0x95, 0x32, 0xd6, 0x9c, 0x1d, 0xf9, 0xfc, 0x46, 0xf6, 0xef, 0x6f, 0x4b, 0x40, 0x7f, 0x00,
- 0x9f, 0x8b, 0x01, 0xad, 0xb9, 0x8c, 0x53, 0xbf, 0x9b, 0x9a, 0x0a, 0x7a, 0x03, 0xc2, 0x63, 0x51,
- 0x14, 0xcf, 0x65, 0x23, 0x50, 0xd0, 0x10, 0x0a, 0x1a, 0x41, 0x21, 0x43, 0xa6, 0x77, 0x71, 0x9d,
- 0xa8, 0xa8, 0x56, 0xc4, 0x53, 0x7f, 0x04, 0x60, 0x71, 0x38, 0x81, 0x52, 0xe5, 0x1d, 0x38, 0x43,
- 0x3c, 0xee, 0xbb, 0x44, 0x20, 0x9c, 0x2d, 0x9f, 0x5b, 0x36, 0x53, 0xb2, 0x5e, 0xa5, 0x0e, 0x51,
- 0x41, 0x5e, 0xf7, 0xb8, 0xdf, 0xad, 0x66, 0xf7, 0x44, 0xf6, 0x61, 0x14, 0xf4, 0xe6, 0x10, 0xf2,
- 0x2b, 0xa9, 0xe4, 0x01, 0x4d, 0x0c, 0xfd, 0x93, 0x01, 0xed, 0x58, 0xb5, 0x2b, 0xd6, 0x0e, 0xb5,
- 0xbb, 0x08, 0x67, 0x6c, 0xea, 0x90, 0x4d, 0xd7, 0x91, 0xda, 0x65, 0xad, 0x69, 0xf1, 0x7a, 0xdb,
- 0x99, 0x98, 0x74, 0x5f, 0x00, 0x78, 0x31, 0x5a, 0xea, 0x0d, 0x97, 0x37, 0x6e, 0xaa, 0xf2, 0xfc,
- 0x1f, 0x7b, 0xe9, 0x97, 0xc1, 0x52, 0x1e, 0x09, 0xa2, 0x4a, 0x79, 0x17, 0x3e, 0x11, 0x5b, 0x3a,
- 0xac, 0xa8, 0x31, 0xc6, 0xda, 0x91, 0xe4, 0x54, 0x41, 0xcf, 0x47, 0x11, 0x26, 0x58, 0xd6, 0x4f,
- 0xc3, 0x34, 0x6e, 0x36, 0x9b, 0x21, 0xc1, 0x3a, 0xc7, 0x9c, 0xfc, 0x77, 0x87, 0xe2, 0x3b, 0x00,
- 0x2f, 0x25, 0x20, 0x28, 0x29, 0x6f, 0xc0, 0xe9, 0x16, 0x75, 0x48, 0x33, 0x94, 0xb0, 0x98, 0x20,
- 0xe1, 0x1d, 0x61, 0xa4, 0x04, 0x53, 0x1e, 0x93, 0x53, 0x6a, 0x43, 0x09, 0x65, 0xe1, 0xad, 0x53,
- 0x0a, 0x75, 0x09, 0x42, 0xb9, 0xc6, 0xa6, 0x83, 0x39, 0x96, 0x08, 0x73, 0x56, 0x4e, 0x7e, 0x72,
- 0x0b, 0x73, 0xac, 0x57, 0x54, 0xfa, 0x27, 0x03, 0xab, 0xf4, 0x11, 0xcc, 0x4a, 0x4f, 0x20, 0x3d,
- 0xe5, 0xb3, 0xfe, 0x01, 0xd4, 0xa4, 0xd3, 0x7a, 0x0b, 0xfb, 0x7c, 0xb2, 0x3c, 0xeb, 0xb0, 0x94,
- 0x18, 0x5a, 0x11, 0x2d, 0x46, 0x89, 0xaa, 0xc5, 0xc7, 0xbd, 0x52, 0x9e, 0x78, 0x36, 0x75, 0x5c,
- 0xaf, 0x6e, 0x7e, 0xc4, 0xa8, 0x67, 0x58, 0x78, 0xeb, 0x0e, 0x61, 0x4c, 0x68, 0x19, 0xf0, 0xbe,
- 0x04, 0xe7, 0xd5, 0x69, 0x49, 0xef, 0x19, 0xfa, 0x5f, 0x00, 0xce, 0x0b, 0xc3, 0xd8, 0xc0, 0xb8,
- 0x3a, 0x60, 0x5d, 0x9d, 0xef, 0xf7, 0x4a, 0xd3, 0xd2, 0xec, 0xd6, 0x61, 0xaf, 0x74, 0xc6, 0x75,
- 0x8e, 0x7a, 0x4e, 0x1e, 0xce, 0xd8, 0x3e, 0xc1, 0x9c, 0xfa, 0x32, 0xbb, 0x9c, 0x15, 0xbe, 0xa2,
- 0xf7, 0x61, 0x4e, 0xe0, 0x6c, 0x36, 0x30, 0x6b, 0xe4, 0xcf, 0x4a, 0xfa, 0x57, 0x1e, 0xf7, 0x4a,
- 0x2b, 0x75, 0x97, 0x37, 0x3a, 0x35, 0xc3, 0xa6, 0x2d, 0x93, 0x13, 0xcf, 0x21, 0x7e, 0xcb, 0xf5,
- 0x78, 0xf4, 0xb1, 0xe9, 0xd6, 0x98, 0x59, 0xeb, 0x72, 0xc2, 0x8c, 0x35, 0xb2, 0x5d, 0x15, 0x0f,
- 0xd6, 0xac, 0x08, 0xb5, 0x86, 0x59, 0x03, 0x3d, 0x03, 0xa7, 0x19, 0xed, 0xf8, 0x36, 0xc9, 0x67,
- 0xe5, 0x7a, 0xea, 0x4d, 0x80, 0xd4, 0x3a, 0x6e, 0xd3, 0x21, 0x7e, 0x7e, 0x2a, 0x00, 0x51, 0xaf,
- 0xaa, 0x89, 0x7c, 0x0e, 0xe0, 0x53, 0x11, 0x59, 0x54, 0xa6, 0x6f, 0xc3, 0x5c, 0x90, 0xa9, 0x68,
- 0x58, 0x20, 0xb2, 0x63, 0x87, 0x35, 0x8d, 0xb8, 0x4a, 0x91, 0xa6, 0x35, 0x6b, 0xab, 0xef, 0x50,
- 0x51, 0x55, 0x4b, 0x56, 0xba, 0x3a, 0x7b, 0xd8, 0x2b, 0xc9, 0xf7, 0xa0, 0x32, 0x8a, 0xe4, 0x6e,
- 0x04, 0x84, 0x85, 0x05, 0x8a, 0x9f, 0x70, 0xf0, 0xaf, 0x4f, 0xf8, 0x0f, 0x00, 0xa2, 0x68, 0x74,
- 0x95, 0xe7, 0x5b, 0x10, 0x1e, 0xe5, 0x19, 0x1e, 0xed, 0xb1, 0x13, 0x0d, 0x4e, 0x79, 0x2e, 0x4c,
- 0x72, 0x72, 0x07, 0x7d, 0xf9, 0x21, 0x84, 0x53, 0x92, 0x16, 0x7d, 0x03, 0xe0, 0x5c, 0xb4, 0x2d,
- 0xa3, 0xa4, 0x69, 0x9c, 0x74, 0x3b, 0x2a, 0x2c, 0x8e, 0xef, 0x10, 0x90, 0xe8, 0xe5, 0xcf, 0x7e,
- 0xfd, 0xf3, 0xeb, 0x33, 0x3a, 0x5a, 0x08, 0xee, 0x77, 0xe1, 0x9d, 0x2c, 0x6c, 0xff, 0xe6, 0x8e,
- 0x3a, 0xc5, 0xbb, 0xe8, 0x47, 0x00, 0x9f, 0x1c, 0xb8, 0x47, 0xa0, 0xe5, 0x71, 0xd6, 0x8b, 0x5f,
- 0x7b, 0x0a, 0x95, 0x53, 0xf9, 0x28, 0xcc, 0x45, 0x89, 0x79, 0x0d, 0x95, 0xd3, 0x30, 0xcd, 0x86,
- 0x42, 0x7b, 0x18, 0xc1, 0x55, 0xb3, 0x72, 0x3c, 0xdc, 0xf8, 0x4d, 0x63, 0x3c, 0xdc, 0x81, 0x61,
- 0xac, 0x1b, 0x12, 0xb7, 0x8c, 0x2e, 0x0f, 0xe2, 0x3a, 0xc4, 0xdc, 0x51, 0x6d, 0x65, 0xf7, 0x88,
- 0x9e, 0xa1, 0x9f, 0x00, 0x9c, 0x1f, 0x1c, 0x47, 0x68, 0xe4, 0xca, 0x09, 0xf3, 0xb3, 0xb0, 0x72,
- 0x3a, 0xa7, 0x34, 0xde, 0x13, 0xf2, 0x32, 0x89, 0xf6, 0x08, 0xc0, 0xf9, 0xc1, 0xf9, 0x31, 0x9a,
- 0x37, 0x61, 0x8c, 0x8d, 0xe6, 0x4d, 0x1a, 0x51, 0xfa, 0xab, 0x92, 0xb7, 0x82, 0x96, 0x52, 0x79,
- 0x7d, 0xbc, 0x65, 0xee, 0x1c, 0x8f, 0x9f, 0x5d, 0xf4, 0x33, 0x80, 0xe8, 0xe4, 0xa8, 0x41, 0xd7,
- 0x47, 0x71, 0x24, 0x4e, 0xbd, 0xc2, 0xcb, 0xa7, 0x75, 0x53, 0x09, 0xbc, 0x26, 0x13, 0xb8, 0x8e,
- 0x2a, 0xe9, 0x82, 0x8b, 0x20, 0xf1, 0x14, 0x1e, 0xc0, 0xac, 0xdc, 0xce, 0x57, 0x46, 0x6f, 0xcd,
- 0xe3, 0x3d, 0x5c, 0x4e, 0x37, 0x54, 0x5c, 0x2f, 0x4a, 0x2e, 0x0d, 0x15, 0x47, 0x6d, 0x5c, 0xb4,
- 0x0d, 0xa7, 0x64, 0x6b, 0x45, 0xa9, 0x81, 0xc3, 0xde, 0x5e, 0xb8, 0x3a, 0x86, 0xa5, 0x62, 0x28,
- 0x48, 0x86, 0x0b, 0x08, 0x9d, 0x64, 0xa8, 0x5a, 0x7b, 0x7f, 0x68, 0x99, 0xef, 0xfb, 0x5a, 0x66,
- 0xaf, 0xaf, 0x81, 0xfd, 0xbe, 0x06, 0x7e, 0xef, 0x6b, 0xe0, 0xab, 0x03, 0x2d, 0xb3, 0x7f, 0xa0,
- 0x65, 0x7e, 0x3b, 0xd0, 0x32, 0x1f, 0x2e, 0x46, 0x66, 0xeb, 0x2a, 0x65, 0xad, 0x0d, 0x11, 0x43,
- 0x04, 0x72, 0xcc, 0x6d, 0xf5, 0x3f, 0xfe, 0x23, 0xb6, 0x36, 0x2d, 0x7f, 0x75, 0x56, 0xfe, 0x09,
- 0x00, 0x00, 0xff, 0xff, 0x55, 0xaf, 0xd8, 0x8c, 0x34, 0x0f, 0x00, 0x00,
+ 0x14, 0xc7, 0x3d, 0xa9, 0xf3, 0xc3, 0xd3, 0x14, 0xc2, 0xa8, 0xd0, 0xc5, 0xb8, 0xeb, 0x68, 0x41,
+ 0xa9, 0x5b, 0xa4, 0xdd, 0xfc, 0x2a, 0x82, 0x72, 0xaa, 0x53, 0x20, 0x95, 0x28, 0x3f, 0x36, 0x42,
+ 0x11, 0xf4, 0x10, 0x8d, 0x77, 0xa7, 0xf6, 0x22, 0x7b, 0x27, 0xdd, 0x99, 0x90, 0x58, 0x51, 0x28,
+ 0xe2, 0xc2, 0x09, 0x81, 0xc4, 0x91, 0x0b, 0x07, 0x0e, 0xa8, 0xc0, 0xbd, 0x47, 0x0e, 0x1c, 0x72,
+ 0x8c, 0xc4, 0x85, 0x93, 0x05, 0x0e, 0x42, 0x28, 0x7f, 0x42, 0x4f, 0x68, 0x66, 0x67, 0x93, 0x5d,
+ 0xc7, 0xeb, 0x75, 0x90, 0x45, 0x2f, 0xd6, 0x8e, 0x77, 0xde, 0x9b, 0xcf, 0xfb, 0xbe, 0x99, 0xf7,
+ 0x66, 0xa1, 0xb6, 0x63, 0x6d, 0x63, 0xd6, 0xb2, 0x78, 0x7b, 0x93, 0x30, 0xeb, 0xfe, 0x16, 0x09,
+ 0xda, 0xe6, 0x66, 0x40, 0x39, 0x45, 0xcf, 0x3a, 0x94, 0xb5, 0xc4, 0x3b, 0x53, 0xfe, 0x7c, 0xb2,
+ 0x50, 0x23, 0x1c, 0x2f, 0x14, 0x2f, 0xd6, 0x69, 0x9d, 0xca, 0x19, 0x96, 0x78, 0x0a, 0x27, 0x17,
+ 0x93, 0x6e, 0xe4, 0xaf, 0x7a, 0x53, 0xaa, 0x53, 0x5a, 0x6f, 0x12, 0x0b, 0x6f, 0x7a, 0x16, 0xf6,
+ 0x7d, 0xca, 0x31, 0xf7, 0xa8, 0x1f, 0xbd, 0xbd, 0x26, 0x16, 0xa1, 0xcc, 0xaa, 0x61, 0x46, 0xc2,
+ 0xd5, 0x2d, 0xb5, 0x90, 0xb5, 0x89, 0xeb, 0x9e, 0x2f, 0x27, 0x87, 0x73, 0x8d, 0x65, 0xa8, 0xbd,
+ 0x2f, 0x66, 0xac, 0x50, 0x9f, 0x07, 0xd8, 0xe1, 0xb7, 0xfd, 0x7b, 0xd4, 0x26, 0xf7, 0xb7, 0x08,
+ 0xe3, 0x48, 0x83, 0x93, 0xd8, 0x75, 0x03, 0xc2, 0x98, 0x06, 0x66, 0x41, 0xa5, 0x60, 0x47, 0x43,
+ 0xe3, 0x2b, 0x00, 0x9f, 0xef, 0x63, 0xc6, 0x36, 0xa9, 0xcf, 0x48, 0xba, 0x1d, 0xb2, 0xe1, 0x05,
+ 0x47, 0x59, 0x6c, 0x78, 0xfe, 0x3d, 0xaa, 0x8d, 0xcd, 0x82, 0xca, 0xf9, 0xc5, 0x17, 0xcd, 0xbe,
+ 0xb2, 0x98, 0x71, 0xef, 0xd5, 0xa9, 0x83, 0x4e, 0x19, 0x1c, 0x75, 0xca, 0x39, 0x7b, 0xda, 0x89,
+ 0xfd, 0x7f, 0x23, 0xff, 0xcf, 0x77, 0x65, 0x60, 0x3c, 0x80, 0x2f, 0x24, 0x80, 0x56, 0x3d, 0xc6,
+ 0x69, 0xd0, 0xce, 0x0c, 0x05, 0xbd, 0x09, 0xe1, 0x89, 0x28, 0x8a, 0x67, 0xce, 0x0c, 0x15, 0x34,
+ 0x85, 0x82, 0x66, 0x98, 0xbf, 0x88, 0xe9, 0x3d, 0x5c, 0x27, 0xca, 0xab, 0x1d, 0xb3, 0x34, 0x1e,
+ 0x01, 0x58, 0xea, 0x4f, 0xa0, 0x54, 0x79, 0x17, 0x4e, 0x12, 0x9f, 0x07, 0x1e, 0x11, 0x08, 0xe7,
+ 0x2a, 0xe7, 0x17, 0xad, 0x8c, 0xa8, 0x57, 0xa8, 0x4b, 0x94, 0x93, 0x37, 0x7c, 0x1e, 0xb4, 0xab,
+ 0xf9, 0x7d, 0x11, 0x7d, 0xe4, 0x05, 0xbd, 0xd5, 0x87, 0xfc, 0x4a, 0x26, 0x79, 0x48, 0x93, 0x40,
+ 0xff, 0xb4, 0x47, 0x3b, 0x56, 0x6d, 0x8b, 0xb5, 0x23, 0xed, 0x2e, 0xc1, 0x49, 0x87, 0xba, 0x64,
+ 0xc3, 0x73, 0xa5, 0x76, 0x79, 0x7b, 0x42, 0x0c, 0x6f, 0xbb, 0x23, 0x93, 0xee, 0x4b, 0x00, 0x2f,
+ 0xc5, 0x53, 0xbd, 0xee, 0xf1, 0xc6, 0x4d, 0x95, 0x9e, 0x27, 0xb1, 0x97, 0x7e, 0xed, 0x4d, 0xe5,
+ 0xb1, 0x20, 0x2a, 0x95, 0x77, 0xe1, 0x53, 0x89, 0xa5, 0xa3, 0x8c, 0x9a, 0x43, 0xac, 0x1d, 0x0b,
+ 0x4e, 0x25, 0xf4, 0x42, 0x1c, 0x61, 0x84, 0x69, 0xfd, 0x2c, 0x0a, 0xe3, 0x66, 0xb3, 0x19, 0x11,
+ 0xac, 0x71, 0xcc, 0xc9, 0xff, 0x77, 0x28, 0xbe, 0x07, 0xf0, 0x72, 0x0a, 0x82, 0x92, 0xf2, 0x06,
+ 0x9c, 0x68, 0x51, 0x97, 0x34, 0x23, 0x09, 0x4b, 0x29, 0x12, 0xde, 0x11, 0x93, 0x94, 0x60, 0xca,
+ 0x62, 0x74, 0x4a, 0xad, 0x2b, 0xa1, 0x6c, 0xbc, 0x7d, 0x46, 0xa1, 0x2e, 0x43, 0x28, 0xd7, 0xd8,
+ 0x70, 0x31, 0xc7, 0x12, 0x61, 0xda, 0x2e, 0xc8, 0x7f, 0x6e, 0x61, 0x8e, 0x8d, 0x25, 0x15, 0xfe,
+ 0x69, 0xc7, 0x2a, 0x7c, 0x04, 0xf3, 0xd2, 0x12, 0x48, 0x4b, 0xf9, 0x6c, 0x7c, 0x08, 0x75, 0x69,
+ 0xb4, 0xd6, 0xc2, 0x01, 0x1f, 0x2d, 0xcf, 0x1a, 0x2c, 0xa7, 0xba, 0x56, 0x44, 0xf3, 0x71, 0xa2,
+ 0x6a, 0xe9, 0x71, 0xa7, 0xac, 0x11, 0xdf, 0xa1, 0xae, 0xe7, 0xd7, 0xad, 0x8f, 0x19, 0xf5, 0x4d,
+ 0x1b, 0x6f, 0xdf, 0x21, 0x8c, 0x09, 0x2d, 0x43, 0xde, 0x97, 0xe1, 0x8c, 0x3a, 0x2d, 0xd9, 0x35,
+ 0xc3, 0xf8, 0x1b, 0xc0, 0x19, 0x31, 0x31, 0xd1, 0x30, 0xae, 0xf6, 0xcc, 0xae, 0xce, 0x74, 0x3b,
+ 0xe5, 0x09, 0x39, 0xed, 0xd6, 0x51, 0xa7, 0x3c, 0xe6, 0xb9, 0xc7, 0x35, 0x47, 0x83, 0x93, 0x4e,
+ 0x40, 0x30, 0xa7, 0x81, 0x8c, 0xae, 0x60, 0x47, 0x43, 0xf4, 0x01, 0x2c, 0x08, 0x9c, 0x8d, 0x06,
+ 0x66, 0x0d, 0xed, 0x9c, 0xa4, 0x7f, 0xf5, 0x71, 0xa7, 0xbc, 0x5c, 0xf7, 0x78, 0x63, 0xab, 0x66,
+ 0x3a, 0xb4, 0x65, 0x71, 0xe2, 0xbb, 0x24, 0x68, 0x79, 0x3e, 0x8f, 0x3f, 0x36, 0xbd, 0x1a, 0xb3,
+ 0x6a, 0x6d, 0x4e, 0x98, 0xb9, 0x4a, 0x76, 0xaa, 0xe2, 0xc1, 0x9e, 0x12, 0xae, 0x56, 0x31, 0x6b,
+ 0xa0, 0xe7, 0xe0, 0x04, 0xa3, 0x5b, 0x81, 0x43, 0xb4, 0xbc, 0x5c, 0x4f, 0x8d, 0x04, 0x48, 0x6d,
+ 0xcb, 0x6b, 0xba, 0x24, 0xd0, 0xc6, 0x43, 0x10, 0x35, 0x54, 0x45, 0xe4, 0x0b, 0x00, 0x9f, 0x89,
+ 0xc9, 0xa2, 0x22, 0x7d, 0x07, 0x16, 0xc2, 0x48, 0x45, 0xc1, 0x02, 0xb1, 0x1d, 0xdb, 0xaf, 0x68,
+ 0x24, 0x55, 0x8a, 0x15, 0xad, 0x29, 0x47, 0xbd, 0x43, 0x25, 0x95, 0x2d, 0x99, 0xe9, 0xea, 0xd4,
+ 0x51, 0xa7, 0x2c, 0xc7, 0x61, 0x66, 0x14, 0xc9, 0xdd, 0x18, 0x08, 0x8b, 0x12, 0x94, 0x3c, 0xe1,
+ 0xe0, 0x3f, 0x9f, 0xf0, 0x1f, 0x01, 0x44, 0x71, 0xef, 0x2a, 0xce, 0xb7, 0x21, 0x3c, 0x8e, 0x33,
+ 0x3a, 0xda, 0x43, 0x07, 0x1a, 0x9e, 0xf2, 0x42, 0x14, 0xe4, 0xe8, 0x0e, 0xfa, 0xe2, 0x43, 0x08,
+ 0xc7, 0x25, 0x2d, 0xfa, 0x16, 0xc0, 0xe9, 0x78, 0x59, 0x46, 0x69, 0xdd, 0x38, 0xed, 0x76, 0x54,
+ 0x9c, 0x1f, 0xde, 0x20, 0x24, 0x31, 0x2a, 0x9f, 0xff, 0xf6, 0xd7, 0x37, 0x63, 0x06, 0x9a, 0x0d,
+ 0xaf, 0x75, 0xd1, 0x9d, 0x2c, 0x2a, 0xff, 0xd6, 0xae, 0x3a, 0xc5, 0x7b, 0xe8, 0x27, 0x00, 0x9f,
+ 0xee, 0xb9, 0x47, 0xa0, 0xc5, 0x61, 0xd6, 0x4b, 0x5e, 0x7b, 0x8a, 0x4b, 0x67, 0xb2, 0x51, 0x98,
+ 0xf3, 0x12, 0xf3, 0x1a, 0xaa, 0x64, 0x61, 0x5a, 0x0d, 0x85, 0xf6, 0x30, 0x86, 0xab, 0x7a, 0xe5,
+ 0x70, 0xb8, 0xc9, 0x9b, 0xc6, 0x70, 0xb8, 0x3d, 0xcd, 0xd8, 0x30, 0x25, 0x6e, 0x05, 0xcd, 0xf5,
+ 0xe2, 0xba, 0xc4, 0xda, 0x55, 0x65, 0x65, 0xef, 0x98, 0x9e, 0xa1, 0x9f, 0x01, 0x9c, 0xe9, 0x6d,
+ 0x47, 0x68, 0xe0, 0xca, 0x29, 0xfd, 0xb3, 0xb8, 0x7c, 0x36, 0xa3, 0x2c, 0xde, 0x53, 0xf2, 0x32,
+ 0x89, 0xf6, 0x08, 0xc0, 0x99, 0xde, 0xfe, 0x31, 0x98, 0x37, 0xa5, 0x8d, 0x0d, 0xe6, 0x4d, 0x6b,
+ 0x51, 0xc6, 0x6b, 0x92, 0x77, 0x09, 0x2d, 0x64, 0xf2, 0x06, 0x78, 0xdb, 0xda, 0x3d, 0x69, 0x3f,
+ 0x7b, 0xe8, 0x17, 0x00, 0xd1, 0xe9, 0x56, 0x83, 0xae, 0x0f, 0xe2, 0x48, 0xed, 0x7a, 0xc5, 0x57,
+ 0xce, 0x6a, 0xa6, 0x02, 0x78, 0x5d, 0x06, 0x70, 0x1d, 0x2d, 0x65, 0x0b, 0x2e, 0x9c, 0x24, 0x43,
+ 0x78, 0x00, 0xf3, 0x72, 0x3b, 0x5f, 0x19, 0xbc, 0x35, 0x4f, 0xf6, 0x70, 0x25, 0x7b, 0xa2, 0xe2,
+ 0x7a, 0x49, 0x72, 0xe9, 0xa8, 0x34, 0x68, 0xe3, 0xa2, 0x1d, 0x38, 0x2e, 0x4b, 0x2b, 0xca, 0x74,
+ 0x1c, 0xd5, 0xf6, 0xe2, 0xd5, 0x21, 0x66, 0x2a, 0x86, 0xa2, 0x64, 0xb8, 0x88, 0xd0, 0x69, 0x86,
+ 0xea, 0xea, 0xfe, 0x9f, 0x7a, 0xee, 0x87, 0xae, 0x9e, 0xdb, 0xef, 0xea, 0xe0, 0xa0, 0xab, 0x83,
+ 0x3f, 0xba, 0x3a, 0xf8, 0xfa, 0x50, 0xcf, 0x1d, 0x1c, 0xea, 0xb9, 0xdf, 0x0f, 0xf5, 0xdc, 0x47,
+ 0x73, 0xb1, 0xde, 0xba, 0x42, 0x59, 0x6b, 0x5d, 0xf8, 0x10, 0x8e, 0x5c, 0x2b, 0xfe, 0xe9, 0x5a,
+ 0x9b, 0x90, 0xdf, 0x9a, 0x4b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x47, 0x8e, 0x3f, 0x56, 0x18,
+ 0x0f, 0x00, 0x00,
}
func (this *QueryContractInfoResponse) Equal(that interface{}) bool {
@@ -1310,7 +1310,7 @@ var _Query_serviceDesc = grpc.ServiceDesc{
},
},
Streams: []grpc.StreamDesc{},
- Metadata: "x/wasm/internal/types/query.proto",
+ Metadata: "x/wasm/types/query.proto",
}
func (m *QueryContractInfoRequest) Marshal() (dAtA []byte, err error) {
diff --git a/x/wasm/internal/types/query.pb.gw.go b/x/wasm/types/query.pb.gw.go
similarity index 99%
rename from x/wasm/internal/types/query.pb.gw.go
rename to x/wasm/types/query.pb.gw.go
index 01f89e1506..8630e48008 100644
--- a/x/wasm/internal/types/query.pb.gw.go
+++ b/x/wasm/types/query.pb.gw.go
@@ -1,5 +1,5 @@
// Code generated by protoc-gen-grpc-gateway. DO NOT EDIT.
-// source: x/wasm/internal/types/query.proto
+// source: x/wasm/types/query.proto
/*
Package types is a reverse proxy.
diff --git a/x/wasm/internal/types/query.proto b/x/wasm/types/query.proto
similarity index 98%
rename from x/wasm/internal/types/query.proto
rename to x/wasm/types/query.proto
index 2b33b42556..d907d92fb3 100644
--- a/x/wasm/internal/types/query.proto
+++ b/x/wasm/types/query.proto
@@ -2,11 +2,11 @@ syntax = "proto3";
package cosmwasm.wasm.v1beta1;
import "gogoproto/gogo.proto";
-import "x/wasm/internal/types/types.proto";
+import "x/wasm/types/types.proto";
import "google/api/annotations.proto";
import "cosmos/base/query/v1beta1/pagination.proto";
-option go_package = "github.com/CosmWasm/wasmd/x/wasmd/internal/types";
+option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
option (gogoproto.goproto_getters_all) = false;
option (gogoproto.equal_all) = false;
diff --git a/x/wasm/internal/types/test_fixtures.go b/x/wasm/types/test_fixtures.go
similarity index 100%
rename from x/wasm/internal/types/test_fixtures.go
rename to x/wasm/types/test_fixtures.go
diff --git a/x/wasm/internal/types/tx.go b/x/wasm/types/tx.go
similarity index 100%
rename from x/wasm/internal/types/tx.go
rename to x/wasm/types/tx.go
diff --git a/x/wasm/internal/types/tx.pb.go b/x/wasm/types/tx.pb.go
similarity index 93%
rename from x/wasm/internal/types/tx.pb.go
rename to x/wasm/types/tx.pb.go
index 41766b2590..9fb9592410 100644
--- a/x/wasm/internal/types/tx.pb.go
+++ b/x/wasm/types/tx.pb.go
@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: x/wasm/internal/types/tx.proto
+// source: x/wasm/types/tx.proto
package types
@@ -49,7 +49,7 @@ func (m *MsgStoreCode) Reset() { *m = MsgStoreCode{} }
func (m *MsgStoreCode) String() string { return proto.CompactTextString(m) }
func (*MsgStoreCode) ProtoMessage() {}
func (*MsgStoreCode) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{0}
+ return fileDescriptor_fdaa78bc8a72122f, []int{0}
}
func (m *MsgStoreCode) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -88,7 +88,7 @@ func (m *MsgStoreCodeResponse) Reset() { *m = MsgStoreCodeResponse{} }
func (m *MsgStoreCodeResponse) String() string { return proto.CompactTextString(m) }
func (*MsgStoreCodeResponse) ProtoMessage() {}
func (*MsgStoreCodeResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{1}
+ return fileDescriptor_fdaa78bc8a72122f, []int{1}
}
func (m *MsgStoreCodeResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -137,7 +137,7 @@ func (m *MsgInstantiateContract) Reset() { *m = MsgInstantiateContract{}
func (m *MsgInstantiateContract) String() string { return proto.CompactTextString(m) }
func (*MsgInstantiateContract) ProtoMessage() {}
func (*MsgInstantiateContract) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{2}
+ return fileDescriptor_fdaa78bc8a72122f, []int{2}
}
func (m *MsgInstantiateContract) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -178,7 +178,7 @@ func (m *MsgInstantiateContractResponse) Reset() { *m = MsgInstantiateCo
func (m *MsgInstantiateContractResponse) String() string { return proto.CompactTextString(m) }
func (*MsgInstantiateContractResponse) ProtoMessage() {}
func (*MsgInstantiateContractResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{3}
+ return fileDescriptor_fdaa78bc8a72122f, []int{3}
}
func (m *MsgInstantiateContractResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -223,7 +223,7 @@ func (m *MsgExecuteContract) Reset() { *m = MsgExecuteContract{} }
func (m *MsgExecuteContract) String() string { return proto.CompactTextString(m) }
func (*MsgExecuteContract) ProtoMessage() {}
func (*MsgExecuteContract) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{4}
+ return fileDescriptor_fdaa78bc8a72122f, []int{4}
}
func (m *MsgExecuteContract) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -262,7 +262,7 @@ func (m *MsgExecuteContractResponse) Reset() { *m = MsgExecuteContractRe
func (m *MsgExecuteContractResponse) String() string { return proto.CompactTextString(m) }
func (*MsgExecuteContractResponse) ProtoMessage() {}
func (*MsgExecuteContractResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{5}
+ return fileDescriptor_fdaa78bc8a72122f, []int{5}
}
func (m *MsgExecuteContractResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -307,7 +307,7 @@ func (m *MsgMigrateContract) Reset() { *m = MsgMigrateContract{} }
func (m *MsgMigrateContract) String() string { return proto.CompactTextString(m) }
func (*MsgMigrateContract) ProtoMessage() {}
func (*MsgMigrateContract) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{6}
+ return fileDescriptor_fdaa78bc8a72122f, []int{6}
}
func (m *MsgMigrateContract) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -347,7 +347,7 @@ func (m *MsgMigrateContractResponse) Reset() { *m = MsgMigrateContractRe
func (m *MsgMigrateContractResponse) String() string { return proto.CompactTextString(m) }
func (*MsgMigrateContractResponse) ProtoMessage() {}
func (*MsgMigrateContractResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{7}
+ return fileDescriptor_fdaa78bc8a72122f, []int{7}
}
func (m *MsgMigrateContractResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -390,7 +390,7 @@ func (m *MsgUpdateAdmin) Reset() { *m = MsgUpdateAdmin{} }
func (m *MsgUpdateAdmin) String() string { return proto.CompactTextString(m) }
func (*MsgUpdateAdmin) ProtoMessage() {}
func (*MsgUpdateAdmin) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{8}
+ return fileDescriptor_fdaa78bc8a72122f, []int{8}
}
func (m *MsgUpdateAdmin) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -427,7 +427,7 @@ func (m *MsgUpdateAdminResponse) Reset() { *m = MsgUpdateAdminResponse{}
func (m *MsgUpdateAdminResponse) String() string { return proto.CompactTextString(m) }
func (*MsgUpdateAdminResponse) ProtoMessage() {}
func (*MsgUpdateAdminResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{9}
+ return fileDescriptor_fdaa78bc8a72122f, []int{9}
}
func (m *MsgUpdateAdminResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -468,7 +468,7 @@ func (m *MsgClearAdmin) Reset() { *m = MsgClearAdmin{} }
func (m *MsgClearAdmin) String() string { return proto.CompactTextString(m) }
func (*MsgClearAdmin) ProtoMessage() {}
func (*MsgClearAdmin) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{10}
+ return fileDescriptor_fdaa78bc8a72122f, []int{10}
}
func (m *MsgClearAdmin) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -505,7 +505,7 @@ func (m *MsgClearAdminResponse) Reset() { *m = MsgClearAdminResponse{} }
func (m *MsgClearAdminResponse) String() string { return proto.CompactTextString(m) }
func (*MsgClearAdminResponse) ProtoMessage() {}
func (*MsgClearAdminResponse) Descriptor() ([]byte, []int) {
- return fileDescriptor_5129e02f2349864e, []int{11}
+ return fileDescriptor_fdaa78bc8a72122f, []int{11}
}
func (m *MsgClearAdminResponse) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -549,61 +549,61 @@ func init() {
proto.RegisterType((*MsgClearAdminResponse)(nil), "cosmwasm.wasm.v1beta1.MsgClearAdminResponse")
}
-func init() { proto.RegisterFile("x/wasm/internal/types/tx.proto", fileDescriptor_5129e02f2349864e) }
-
-var fileDescriptor_5129e02f2349864e = []byte{
- // 808 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcd, 0x6e, 0xf3, 0x44,
- 0x14, 0x8d, 0xbf, 0xfc, 0x35, 0x37, 0xe1, 0x03, 0x99, 0xb6, 0x18, 0x83, 0x9c, 0x90, 0x82, 0x14,
- 0x04, 0xb5, 0xdb, 0x22, 0x60, 0x81, 0x58, 0x34, 0x81, 0x45, 0x17, 0xae, 0x90, 0x2b, 0x54, 0xa9,
- 0x12, 0x0a, 0x13, 0x7b, 0x6a, 0x06, 0xe2, 0x99, 0xc8, 0x33, 0x21, 0xa9, 0x78, 0x03, 0x56, 0xbc,
- 0x00, 0x2f, 0x80, 0x78, 0x90, 0x2e, 0xbb, 0x44, 0x42, 0x0a, 0x90, 0x6e, 0x79, 0x02, 0x56, 0x68,
- 0x6c, 0xc7, 0x71, 0x43, 0x1c, 0x19, 0x21, 0x36, 0xf6, 0xdc, 0xf1, 0xb9, 0xe7, 0xf8, 0x1e, 0xdd,
- 0x3b, 0x1a, 0x30, 0xe6, 0xd6, 0x0c, 0xf1, 0xc0, 0x22, 0x54, 0xe0, 0x90, 0xa2, 0xb1, 0x25, 0xee,
- 0x26, 0x98, 0x5b, 0x62, 0x6e, 0x4e, 0x42, 0x26, 0x98, 0x7a, 0xe0, 0x32, 0x1e, 0x48, 0x84, 0x19,
- 0x3d, 0xbe, 0x3d, 0x1d, 0x61, 0x81, 0x4e, 0x75, 0x43, 0x6e, 0x33, 0x6e, 0x8d, 0x10, 0xc7, 0x56,
- 0xb2, 0x69, 0xb9, 0x8c, 0xd0, 0x38, 0x4d, 0xdf, 0xf7, 0x99, 0xcf, 0xa2, 0xa5, 0x25, 0x57, 0xc9,
- 0xee, 0x1b, 0x39, 0x62, 0xf2, 0x19, 0x43, 0xba, 0x7f, 0x2a, 0xd0, 0xb2, 0xb9, 0x7f, 0x25, 0x58,
- 0x88, 0x07, 0xcc, 0xc3, 0xea, 0x21, 0xd4, 0x38, 0xa6, 0x1e, 0x0e, 0x35, 0xa5, 0xa3, 0xf4, 0x1a,
- 0x4e, 0x12, 0xa9, 0x1f, 0xc0, 0x73, 0xc9, 0x35, 0x1c, 0xdd, 0x09, 0x3c, 0x74, 0x99, 0x87, 0xb5,
- 0x67, 0x1d, 0xa5, 0xd7, 0xea, 0xbf, 0xb4, 0x5c, 0xb4, 0x5b, 0xd7, 0xe7, 0x57, 0x76, 0xff, 0x4e,
- 0x44, 0x0c, 0x4e, 0x4b, 0xe2, 0x56, 0x51, 0xc4, 0xc7, 0xa6, 0xa1, 0x8b, 0xb5, 0x72, 0xc2, 0x17,
- 0x45, 0xaa, 0x06, 0xf5, 0xd1, 0x94, 0x8c, 0xa5, 0x50, 0x25, 0xfa, 0xb0, 0x0a, 0xd5, 0x1b, 0x38,
- 0x24, 0x94, 0x0b, 0x44, 0x05, 0x41, 0x02, 0x0f, 0x27, 0x38, 0x0c, 0x08, 0xe7, 0x84, 0x51, 0xad,
- 0xda, 0x51, 0x7a, 0xcd, 0xb3, 0x23, 0x73, 0xab, 0x47, 0xe6, 0xb9, 0xeb, 0x62, 0xce, 0x07, 0x8c,
- 0xde, 0x12, 0xdf, 0x39, 0xc8, 0x50, 0x7c, 0x96, 0x32, 0x74, 0x3f, 0x82, 0xfd, 0x6c, 0xb5, 0x0e,
- 0xe6, 0x13, 0x46, 0x39, 0x56, 0x8f, 0xa0, 0x2e, 0x6b, 0x1a, 0x12, 0x2f, 0x2a, 0xbb, 0xd2, 0x87,
- 0xe5, 0xa2, 0x5d, 0x93, 0x90, 0x8b, 0x4f, 0x9c, 0x9a, 0xfc, 0x74, 0xe1, 0x75, 0x7f, 0x7c, 0x06,
- 0x87, 0x36, 0xf7, 0x2f, 0xd6, 0xcc, 0x03, 0x46, 0x45, 0x88, 0x5c, 0x91, 0xeb, 0xda, 0x3e, 0x54,
- 0x91, 0x17, 0x10, 0x1a, 0x99, 0xd5, 0x70, 0xe2, 0x20, 0xab, 0x56, 0xce, 0x53, 0x93, 0xa9, 0x63,
- 0x34, 0xc2, 0xe3, 0xc4, 0x9e, 0x38, 0x50, 0x3f, 0x84, 0x3d, 0x42, 0x89, 0x18, 0x06, 0xdc, 0x8f,
- 0xec, 0x68, 0xf5, 0x5f, 0xff, 0x6b, 0xd1, 0xd6, 0x30, 0x75, 0x99, 0x47, 0xa8, 0x6f, 0x7d, 0xcd,
- 0x19, 0x35, 0x1d, 0x34, 0xb3, 0x31, 0xe7, 0xc8, 0xc7, 0x4e, 0x5d, 0xa2, 0x6d, 0xee, 0xab, 0x08,
- 0xaa, 0xb7, 0x53, 0xea, 0x71, 0xad, 0xd6, 0x29, 0xf7, 0x9a, 0x67, 0xaf, 0x9a, 0x71, 0x47, 0x99,
- 0xb2, 0xa3, 0x52, 0x0b, 0x07, 0x8c, 0xd0, 0xfe, 0xc9, 0xfd, 0xa2, 0x5d, 0xfa, 0xe9, 0xb7, 0x76,
- 0xcf, 0x27, 0xe2, 0xab, 0xe9, 0xc8, 0x74, 0x59, 0x60, 0x25, 0xed, 0x17, 0xbf, 0x8e, 0xb9, 0xf7,
- 0x4d, 0xd2, 0x44, 0x32, 0x81, 0x3b, 0x31, 0x73, 0xf7, 0x12, 0x8c, 0xed, 0xf6, 0xa4, 0x36, 0x6b,
- 0x50, 0x47, 0x9e, 0x17, 0x62, 0xce, 0x13, 0x9f, 0x56, 0xa1, 0xaa, 0x42, 0xc5, 0x43, 0x02, 0xc5,
- 0x4d, 0xe5, 0x44, 0xeb, 0xee, 0xaf, 0x0a, 0xa8, 0x36, 0xf7, 0x3f, 0x9d, 0x63, 0x77, 0x5a, 0xc0,
- 0x6b, 0x1d, 0xf6, 0xdc, 0x04, 0x93, 0xd8, 0x9d, 0xc6, 0xaa, 0x09, 0x65, 0xe9, 0x58, 0xb9, 0x80,
- 0x63, 0x12, 0xb8, 0x76, 0xab, 0xfa, 0xbf, 0xb9, 0x75, 0x02, 0xfa, 0x3f, 0x8b, 0x4b, 0x9d, 0x5a,
- 0xf9, 0xa1, 0x64, 0xfc, 0xf8, 0x39, 0xf6, 0xc3, 0x26, 0x7e, 0x88, 0xfe, 0xa3, 0x1f, 0x85, 0x3a,
- 0xf0, 0x63, 0x68, 0x06, 0xb1, 0x56, 0xd4, 0x6e, 0x95, 0x02, 0xe6, 0x41, 0x92, 0x60, 0x73, 0x3f,
- 0x29, 0x70, 0xe3, 0x6f, 0x77, 0x16, 0x88, 0xe0, 0xb9, 0xcd, 0xfd, 0xcf, 0x27, 0x1e, 0x12, 0xf8,
- 0x3c, 0x9a, 0x94, 0xbc, 0xda, 0x5e, 0x83, 0x06, 0xc5, 0xb3, 0x61, 0x76, 0xb6, 0xf6, 0x28, 0x9e,
- 0xc5, 0x49, 0xd9, 0xc2, 0xcb, 0x4f, 0x0b, 0xef, 0x6a, 0xd1, 0x08, 0x67, 0x24, 0x56, 0x3f, 0xd4,
- 0x1d, 0xc0, 0x0b, 0x36, 0xf7, 0x07, 0x63, 0x8c, 0xc2, 0xdd, 0xda, 0xbb, 0xe8, 0x5f, 0x81, 0x83,
- 0x27, 0x24, 0x2b, 0xf6, 0xb3, 0xef, 0xab, 0x50, 0x96, 0x63, 0xf8, 0x05, 0x34, 0xd6, 0x67, 0x6d,
- 0xde, 0x49, 0x96, 0x3d, 0xa2, 0xf4, 0x77, 0x0a, 0x80, 0x52, 0x57, 0xbf, 0x83, 0x97, 0xb7, 0x1d,
- 0x4f, 0xc7, 0xf9, 0x1c, 0x5b, 0xe0, 0xfa, 0xfb, 0xff, 0x0a, 0x9e, 0x8a, 0x33, 0x78, 0x71, 0x73,
- 0x56, 0xdf, 0xce, 0x67, 0xda, 0x80, 0xea, 0xa7, 0x85, 0xa1, 0x59, 0xc1, 0xcd, 0x61, 0xd8, 0x21,
- 0xb8, 0x01, 0xdd, 0x25, 0x98, 0xd7, 0xb4, 0x2e, 0x34, 0xb3, 0xdd, 0xf9, 0x56, 0x3e, 0x43, 0x06,
- 0xa6, 0x1f, 0x17, 0x82, 0xa5, 0x22, 0x5f, 0x02, 0x64, 0xba, 0xf0, 0xcd, 0xfc, 0xe4, 0x35, 0x4a,
- 0x7f, 0xb7, 0x08, 0x6a, 0xa5, 0xd0, 0xbf, 0xbc, 0xff, 0xc3, 0x28, 0xdd, 0x2f, 0x0d, 0xe5, 0x61,
- 0x69, 0x28, 0xbf, 0x2f, 0x0d, 0xe5, 0x87, 0x47, 0xa3, 0xf4, 0xf0, 0x68, 0x94, 0x7e, 0x79, 0x34,
- 0x4a, 0x37, 0x27, 0x99, 0x93, 0x6c, 0xc0, 0x78, 0x70, 0x2d, 0xaf, 0x10, 0x92, 0xd5, 0xb3, 0xe6,
- 0xc9, 0xfb, 0xe9, 0x85, 0x62, 0x54, 0x8b, 0xee, 0x12, 0xef, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff,
- 0x96, 0x93, 0x22, 0x47, 0xdd, 0x08, 0x00, 0x00,
+func init() { proto.RegisterFile("x/wasm/types/tx.proto", fileDescriptor_fdaa78bc8a72122f) }
+
+var fileDescriptor_fdaa78bc8a72122f = []byte{
+ // 804 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4f, 0x6f, 0xe3, 0x44,
+ 0x14, 0x8f, 0x9b, 0x7f, 0xcd, 0x4b, 0x28, 0xc8, 0x34, 0xc5, 0x18, 0xe4, 0x44, 0x29, 0xa0, 0x20,
+ 0xa8, 0xdd, 0x16, 0x01, 0x07, 0xc4, 0xa1, 0x49, 0x39, 0xf4, 0x60, 0x84, 0x5c, 0xa1, 0x4a, 0x95,
+ 0x50, 0x98, 0xd8, 0x53, 0x63, 0x88, 0x67, 0x22, 0xcf, 0x84, 0xb4, 0xe2, 0x1b, 0x70, 0xe2, 0x0b,
+ 0xf0, 0x05, 0x10, 0x1f, 0xa4, 0xc7, 0x1e, 0x57, 0x5a, 0x29, 0xbb, 0x9b, 0x5e, 0xf7, 0x13, 0xec,
+ 0x69, 0x35, 0xb6, 0xe3, 0xb8, 0xd9, 0x38, 0xf2, 0x6a, 0xb5, 0x97, 0x64, 0xde, 0xcc, 0xef, 0xfd,
+ 0x7e, 0x7e, 0x3f, 0xbd, 0x37, 0x1a, 0x68, 0x5e, 0x1b, 0x53, 0xc4, 0x7c, 0x83, 0xdf, 0x8c, 0x31,
+ 0x33, 0xf8, 0xb5, 0x3e, 0x0e, 0x28, 0xa7, 0x72, 0xd3, 0xa6, 0xcc, 0x17, 0x07, 0x7a, 0xf8, 0xf3,
+ 0xe7, 0xd1, 0x10, 0x73, 0x74, 0xa4, 0x6a, 0x62, 0x9b, 0x32, 0x63, 0x88, 0x18, 0x36, 0xe2, 0x4d,
+ 0xc3, 0xa6, 0x1e, 0x89, 0xd2, 0xd4, 0x5d, 0x97, 0xba, 0x34, 0x5c, 0x1a, 0x62, 0x15, 0xef, 0x2a,
+ 0x0f, 0x35, 0xc4, 0x6f, 0x74, 0xd2, 0x79, 0x2e, 0x41, 0xc3, 0x64, 0xee, 0x39, 0xa7, 0x01, 0xee,
+ 0x53, 0x07, 0xcb, 0x7b, 0x50, 0x61, 0x98, 0x38, 0x38, 0x50, 0xa4, 0xb6, 0xd4, 0xad, 0x59, 0x71,
+ 0x24, 0x7f, 0x03, 0x3b, 0x82, 0x62, 0x30, 0xbc, 0xe1, 0x78, 0x60, 0x53, 0x07, 0x2b, 0x5b, 0x6d,
+ 0xa9, 0xdb, 0xe8, 0xbd, 0x37, 0x9f, 0xb5, 0x1a, 0x17, 0x27, 0xe7, 0x66, 0xef, 0x86, 0x87, 0x0c,
+ 0x56, 0x43, 0xe0, 0x16, 0x51, 0xc8, 0x47, 0x27, 0x81, 0x8d, 0x95, 0x62, 0xcc, 0x17, 0x46, 0xb2,
+ 0x02, 0xd5, 0xe1, 0xc4, 0x1b, 0x09, 0xa1, 0x52, 0x78, 0xb0, 0x08, 0xe5, 0x4b, 0xd8, 0xf3, 0x08,
+ 0xe3, 0x88, 0x70, 0x0f, 0x71, 0x3c, 0x18, 0xe3, 0xc0, 0xf7, 0x18, 0xf3, 0x28, 0x51, 0xca, 0x6d,
+ 0xa9, 0x5b, 0x3f, 0xde, 0xd7, 0xd7, 0x5a, 0xa3, 0x9f, 0xd8, 0x36, 0x66, 0xac, 0x4f, 0xc9, 0x95,
+ 0xe7, 0x5a, 0xcd, 0x14, 0xc5, 0x4f, 0x09, 0x43, 0xe7, 0x3b, 0xd8, 0x4d, 0x57, 0x6b, 0x61, 0x36,
+ 0xa6, 0x84, 0x61, 0x79, 0x1f, 0xaa, 0xa2, 0xa6, 0x81, 0xe7, 0x84, 0x65, 0x97, 0x7a, 0x30, 0x9f,
+ 0xb5, 0x2a, 0x02, 0x72, 0x76, 0x6a, 0x55, 0xc4, 0xd1, 0x99, 0xd3, 0xf9, 0x77, 0x0b, 0xf6, 0x4c,
+ 0xe6, 0x9e, 0x2d, 0x99, 0xfb, 0x94, 0xf0, 0x00, 0xd9, 0x3c, 0xd3, 0xb5, 0x5d, 0x28, 0x23, 0xc7,
+ 0xf7, 0x48, 0x68, 0x56, 0xcd, 0x8a, 0x82, 0xb4, 0x5a, 0x31, 0x4b, 0x4d, 0xa4, 0x8e, 0xd0, 0x10,
+ 0x8f, 0x62, 0x7b, 0xa2, 0x40, 0xfe, 0x16, 0xb6, 0x3d, 0xe2, 0xf1, 0x81, 0xcf, 0xdc, 0xd0, 0x8e,
+ 0x46, 0xef, 0xe3, 0x17, 0xb3, 0x96, 0x82, 0x89, 0x4d, 0x1d, 0x8f, 0xb8, 0xc6, 0xef, 0x8c, 0x12,
+ 0xdd, 0x42, 0x53, 0x13, 0x33, 0x86, 0x5c, 0x6c, 0x55, 0x05, 0xda, 0x64, 0xae, 0x8c, 0xa0, 0x7c,
+ 0x35, 0x21, 0x0e, 0x53, 0x2a, 0xed, 0x62, 0xb7, 0x7e, 0xfc, 0xa1, 0x1e, 0x35, 0x92, 0x2e, 0x1a,
+ 0x29, 0xb1, 0xb0, 0x4f, 0x3d, 0xd2, 0x3b, 0xbc, 0x9d, 0xb5, 0x0a, 0xff, 0x3d, 0x69, 0x75, 0x5d,
+ 0x8f, 0xff, 0x36, 0x19, 0xea, 0x36, 0xf5, 0x8d, 0xb8, 0xeb, 0xa2, 0xbf, 0x03, 0xe6, 0xfc, 0x11,
+ 0x37, 0x91, 0x48, 0x60, 0x56, 0xc4, 0xdc, 0xf9, 0x11, 0xb4, 0xf5, 0xf6, 0x24, 0x36, 0x2b, 0x50,
+ 0x45, 0x8e, 0x13, 0x60, 0xc6, 0x62, 0x9f, 0x16, 0xa1, 0x2c, 0x43, 0xc9, 0x41, 0x1c, 0x45, 0x4d,
+ 0x65, 0x85, 0xeb, 0xce, 0x63, 0x09, 0x64, 0x93, 0xb9, 0x3f, 0x5c, 0x63, 0x7b, 0x92, 0xc3, 0x6b,
+ 0x15, 0xb6, 0xed, 0x18, 0x13, 0xdb, 0x9d, 0xc4, 0xb2, 0x0e, 0x45, 0xe1, 0x58, 0x31, 0x87, 0x63,
+ 0x02, 0xb8, 0x74, 0xab, 0xfc, 0xd6, 0xdc, 0x3a, 0x04, 0xf5, 0xd5, 0xe2, 0x12, 0xa7, 0x16, 0x7e,
+ 0x48, 0x29, 0x3f, 0xfe, 0x8f, 0xfc, 0x30, 0x3d, 0x37, 0x40, 0x6f, 0xe8, 0x47, 0xae, 0x0e, 0xfc,
+ 0x1e, 0xea, 0x7e, 0xa4, 0x15, 0xb6, 0x5b, 0x29, 0x87, 0x79, 0x10, 0x27, 0x98, 0xcc, 0x8d, 0x0b,
+ 0x5c, 0xf9, 0xda, 0x8d, 0x05, 0x22, 0xd8, 0x31, 0x99, 0xfb, 0xf3, 0xd8, 0x41, 0x1c, 0x9f, 0x84,
+ 0x93, 0x92, 0x55, 0xdb, 0x47, 0x50, 0x23, 0x78, 0x3a, 0x48, 0xcf, 0xd6, 0x36, 0xc1, 0xd3, 0x28,
+ 0x29, 0x5d, 0x78, 0xf1, 0x61, 0xe1, 0x1d, 0x25, 0x1c, 0xe1, 0x94, 0xc4, 0xe2, 0x83, 0x3a, 0x7d,
+ 0x78, 0xc7, 0x64, 0x6e, 0x7f, 0x84, 0x51, 0xb0, 0x59, 0x7b, 0x13, 0xfd, 0x07, 0xd0, 0x7c, 0x40,
+ 0xb2, 0x60, 0x3f, 0xfe, 0xbb, 0x0c, 0x45, 0x31, 0x86, 0xbf, 0x40, 0x6d, 0x79, 0xd7, 0x66, 0xdd,
+ 0x64, 0xe9, 0x2b, 0x4a, 0xfd, 0x22, 0x07, 0x28, 0x71, 0xf5, 0x2f, 0x78, 0x7f, 0xdd, 0xf5, 0x74,
+ 0x90, 0xcd, 0xb1, 0x06, 0xae, 0x7e, 0xfd, 0x5a, 0xf0, 0x44, 0x9c, 0xc2, 0xbb, 0xab, 0xb3, 0xfa,
+ 0x79, 0x36, 0xd3, 0x0a, 0x54, 0x3d, 0xca, 0x0d, 0x4d, 0x0b, 0xae, 0x0e, 0xc3, 0x06, 0xc1, 0x15,
+ 0xe8, 0x26, 0xc1, 0xac, 0xa6, 0xb5, 0xa1, 0x9e, 0xee, 0xce, 0x4f, 0xb3, 0x19, 0x52, 0x30, 0xf5,
+ 0x20, 0x17, 0x2c, 0x11, 0xf9, 0x15, 0x20, 0xd5, 0x85, 0x9f, 0x64, 0x27, 0x2f, 0x51, 0xea, 0x97,
+ 0x79, 0x50, 0x0b, 0x85, 0xde, 0xe9, 0xed, 0x33, 0xad, 0x70, 0x3b, 0xd7, 0xa4, 0xbb, 0xb9, 0x26,
+ 0x3d, 0x9d, 0x6b, 0xd2, 0x3f, 0xf7, 0x5a, 0xe1, 0xee, 0x5e, 0x2b, 0x3c, 0xba, 0xd7, 0x0a, 0x97,
+ 0x9f, 0xa5, 0x6e, 0xb2, 0x3e, 0x65, 0xfe, 0x85, 0x78, 0x39, 0x08, 0x56, 0xc7, 0x48, 0x3f, 0x23,
+ 0x86, 0x95, 0xf0, 0x05, 0xf1, 0xd5, 0xcb, 0x00, 0x00, 0x00, 0xff, 0xff, 0x23, 0x6f, 0xe6, 0xee,
+ 0xc1, 0x08, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -875,7 +875,7 @@ var _Msg_serviceDesc = grpc.ServiceDesc{
},
},
Streams: []grpc.StreamDesc{},
- Metadata: "x/wasm/internal/types/tx.proto",
+ Metadata: "x/wasm/types/tx.proto",
}
func (m *MsgStoreCode) Marshal() (dAtA []byte, err error) {
diff --git a/x/wasm/internal/types/tx.proto b/x/wasm/types/tx.proto
similarity index 97%
rename from x/wasm/internal/types/tx.proto
rename to x/wasm/types/tx.proto
index 370c0d4982..07932c4f4b 100644
--- a/x/wasm/internal/types/tx.proto
+++ b/x/wasm/types/tx.proto
@@ -4,9 +4,9 @@ package cosmwasm.wasm.v1beta1;
import "cosmos/base/v1beta1/coin.proto";
import "gogoproto/gogo.proto";
-import "x/wasm/internal/types/types.proto";
+import "x/wasm/types/types.proto";
-option go_package = "github.com/CosmWasm/wasmd/x/wasmd/internal/types";
+option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
option (gogoproto.goproto_getters_all) = false;
// Msg defines the wasm Msg service.
diff --git a/x/wasm/internal/types/tx_test.go b/x/wasm/types/tx_test.go
similarity index 100%
rename from x/wasm/internal/types/tx_test.go
rename to x/wasm/types/tx_test.go
diff --git a/x/wasm/internal/types/types.go b/x/wasm/types/types.go
similarity index 100%
rename from x/wasm/internal/types/types.go
rename to x/wasm/types/types.go
diff --git a/x/wasm/internal/types/types.pb.go b/x/wasm/types/types.pb.go
similarity index 88%
rename from x/wasm/internal/types/types.pb.go
rename to x/wasm/types/types.pb.go
index 35cba507cd..eed0b27771 100644
--- a/x/wasm/internal/types/types.pb.go
+++ b/x/wasm/types/types.pb.go
@@ -1,5 +1,5 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: x/wasm/internal/types/types.proto
+// source: x/wasm/types/types.proto
package types
@@ -55,7 +55,7 @@ var AccessType_value = map[string]int32{
}
func (AccessType) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor_45de2b3fc8aff6aa, []int{0}
+ return fileDescriptor_8b85390a762df19f, []int{0}
}
// ContractCodeHistoryOperationType actions that caused a code change
@@ -91,7 +91,7 @@ func (x ContractCodeHistoryOperationType) String() string {
}
func (ContractCodeHistoryOperationType) EnumDescriptor() ([]byte, []int) {
- return fileDescriptor_45de2b3fc8aff6aa, []int{1}
+ return fileDescriptor_8b85390a762df19f, []int{1}
}
// AccessTypeParam
@@ -103,7 +103,7 @@ func (m *AccessTypeParam) Reset() { *m = AccessTypeParam{} }
func (m *AccessTypeParam) String() string { return proto.CompactTextString(m) }
func (*AccessTypeParam) ProtoMessage() {}
func (*AccessTypeParam) Descriptor() ([]byte, []int) {
- return fileDescriptor_45de2b3fc8aff6aa, []int{0}
+ return fileDescriptor_8b85390a762df19f, []int{0}
}
func (m *AccessTypeParam) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -142,7 +142,7 @@ func (m *AccessConfig) Reset() { *m = AccessConfig{} }
func (m *AccessConfig) String() string { return proto.CompactTextString(m) }
func (*AccessConfig) ProtoMessage() {}
func (*AccessConfig) Descriptor() ([]byte, []int) {
- return fileDescriptor_45de2b3fc8aff6aa, []int{1}
+ return fileDescriptor_8b85390a762df19f, []int{1}
}
func (m *AccessConfig) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -181,7 +181,7 @@ type Params struct {
func (m *Params) Reset() { *m = Params{} }
func (*Params) ProtoMessage() {}
func (*Params) Descriptor() ([]byte, []int) {
- return fileDescriptor_45de2b3fc8aff6aa, []int{2}
+ return fileDescriptor_8b85390a762df19f, []int{2}
}
func (m *Params) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -228,7 +228,7 @@ func (m *CodeInfo) Reset() { *m = CodeInfo{} }
func (m *CodeInfo) String() string { return proto.CompactTextString(m) }
func (*CodeInfo) ProtoMessage() {}
func (*CodeInfo) Descriptor() ([]byte, []int) {
- return fileDescriptor_45de2b3fc8aff6aa, []int{3}
+ return fileDescriptor_8b85390a762df19f, []int{3}
}
func (m *CodeInfo) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -277,7 +277,7 @@ func (m *ContractInfo) Reset() { *m = ContractInfo{} }
func (m *ContractInfo) String() string { return proto.CompactTextString(m) }
func (*ContractInfo) ProtoMessage() {}
func (*ContractInfo) Descriptor() ([]byte, []int) {
- return fileDescriptor_45de2b3fc8aff6aa, []int{4}
+ return fileDescriptor_8b85390a762df19f, []int{4}
}
func (m *ContractInfo) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -320,7 +320,7 @@ func (m *ContractCodeHistoryEntry) Reset() { *m = ContractCodeHistoryEnt
func (m *ContractCodeHistoryEntry) String() string { return proto.CompactTextString(m) }
func (*ContractCodeHistoryEntry) ProtoMessage() {}
func (*ContractCodeHistoryEntry) Descriptor() ([]byte, []int) {
- return fileDescriptor_45de2b3fc8aff6aa, []int{5}
+ return fileDescriptor_8b85390a762df19f, []int{5}
}
func (m *ContractCodeHistoryEntry) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -361,7 +361,7 @@ func (m *AbsoluteTxPosition) Reset() { *m = AbsoluteTxPosition{} }
func (m *AbsoluteTxPosition) String() string { return proto.CompactTextString(m) }
func (*AbsoluteTxPosition) ProtoMessage() {}
func (*AbsoluteTxPosition) Descriptor() ([]byte, []int) {
- return fileDescriptor_45de2b3fc8aff6aa, []int{6}
+ return fileDescriptor_8b85390a762df19f, []int{6}
}
func (m *AbsoluteTxPosition) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -402,7 +402,7 @@ func (m *Model) Reset() { *m = Model{} }
func (m *Model) String() string { return proto.CompactTextString(m) }
func (*Model) ProtoMessage() {}
func (*Model) Descriptor() ([]byte, []int) {
- return fileDescriptor_45de2b3fc8aff6aa, []int{7}
+ return fileDescriptor_8b85390a762df19f, []int{7}
}
func (m *Model) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
@@ -444,81 +444,80 @@ func init() {
proto.RegisterType((*Model)(nil), "cosmwasm.wasm.v1beta1.Model")
}
-func init() { proto.RegisterFile("x/wasm/internal/types/types.proto", fileDescriptor_45de2b3fc8aff6aa) }
-
-var fileDescriptor_45de2b3fc8aff6aa = []byte{
- // 1130 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcf, 0x8f, 0xdb, 0xc4,
- 0x17, 0x8f, 0x93, 0xec, 0xaf, 0xe9, 0x7e, 0xdb, 0x74, 0xbe, 0x5d, 0x9a, 0x86, 0x92, 0x64, 0x5d,
- 0x10, 0xdb, 0x1f, 0x24, 0x6d, 0x41, 0x14, 0xf5, 0x96, 0x38, 0xa6, 0xeb, 0x8a, 0x4d, 0xa2, 0x49,
- 0x96, 0x76, 0x91, 0x90, 0x35, 0xb6, 0x67, 0xb3, 0x43, 0x6d, 0x4f, 0xe4, 0x99, 0xb4, 0x49, 0xff,
- 0x02, 0xb4, 0x5c, 0x10, 0x27, 0x0e, 0xac, 0x84, 0x04, 0x42, 0xfd, 0x53, 0x7a, 0x41, 0xea, 0x91,
- 0x53, 0x04, 0xa9, 0x90, 0xe0, 0xba, 0xdc, 0x7a, 0x42, 0x9e, 0xc9, 0x2a, 0x86, 0xb6, 0xbb, 0xe1,
- 0xe2, 0xcc, 0x7b, 0xf3, 0x3e, 0x9f, 0xf7, 0x3e, 0x6f, 0xe6, 0x39, 0x06, 0xeb, 0xc3, 0xea, 0x23,
- 0xcc, 0x83, 0x2a, 0x0d, 0x05, 0x89, 0x42, 0xec, 0x57, 0xc5, 0xa8, 0x4f, 0xb8, 0x7a, 0x56, 0xfa,
- 0x11, 0x13, 0x0c, 0xae, 0xb9, 0x8c, 0x07, 0x71, 0x50, 0x45, 0x3e, 0x1e, 0xde, 0x70, 0x88, 0xc0,
- 0x37, 0x0a, 0xe7, 0x7a, 0xac, 0xc7, 0x64, 0x44, 0x35, 0x5e, 0xa9, 0x60, 0xdd, 0x01, 0x67, 0x6a,
- 0xae, 0x4b, 0x38, 0xef, 0x8e, 0xfa, 0xa4, 0x8d, 0x23, 0x1c, 0x40, 0x0b, 0x2c, 0x3c, 0xc4, 0xfe,
- 0x80, 0xe4, 0xb5, 0xb2, 0xb6, 0x71, 0xfa, 0xe6, 0x7a, 0xe5, 0x95, 0x7c, 0x95, 0x19, 0xac, 0x9e,
- 0x3b, 0x1c, 0x97, 0x56, 0x47, 0x38, 0xf0, 0x6f, 0xeb, 0x12, 0xa9, 0x23, 0xc5, 0x70, 0x3b, 0xfb,
- 0xed, 0xf7, 0x25, 0x4d, 0xff, 0x4e, 0x03, 0xab, 0x2a, 0xda, 0x60, 0xe1, 0x2e, 0xed, 0xc1, 0xfb,
- 0x00, 0xf4, 0x49, 0x14, 0x50, 0xce, 0x29, 0x0b, 0xe7, 0x4f, 0xb3, 0x76, 0x38, 0x2e, 0x9d, 0x55,
- 0x69, 0x66, 0x70, 0x1d, 0x25, 0xb8, 0xe0, 0x35, 0xb0, 0x84, 0x3d, 0x2f, 0x22, 0x9c, 0xe7, 0xd3,
- 0x65, 0x6d, 0x63, 0xa5, 0x0e, 0x0f, 0xc7, 0xa5, 0xd3, 0x0a, 0x33, 0xdd, 0xd0, 0xd1, 0x51, 0xc8,
- 0xb4, 0xbc, 0xdf, 0xd3, 0x60, 0x51, 0x2a, 0xe7, 0x50, 0x00, 0xe8, 0x32, 0x8f, 0xd8, 0x83, 0xbe,
- 0xcf, 0xb0, 0x67, 0x63, 0x99, 0x5b, 0x16, 0x78, 0xea, 0xe6, 0xa5, 0x63, 0x0b, 0x54, 0xca, 0xea,
- 0xeb, 0x4f, 0xc7, 0xa5, 0xd4, 0xe1, 0xb8, 0x74, 0x41, 0xa5, 0x7c, 0x99, 0x4c, 0x47, 0xb9, 0xd8,
- 0xb9, 0x2d, 0x7d, 0x0a, 0x0a, 0xbf, 0xd1, 0x40, 0x91, 0x86, 0x5c, 0xe0, 0x50, 0x50, 0x2c, 0x88,
- 0xed, 0x91, 0x5d, 0x3c, 0xf0, 0x85, 0x9d, 0xe8, 0x51, 0x7a, 0xde, 0x1e, 0x5d, 0x3e, 0x1c, 0x97,
- 0xde, 0x51, 0xc9, 0x8f, 0xa7, 0xd4, 0xd1, 0xc5, 0x44, 0x40, 0x43, 0xed, 0xb7, 0x67, 0x9d, 0xbc,
- 0x0b, 0x60, 0x80, 0x87, 0x76, 0x9c, 0xc7, 0x96, 0x32, 0x38, 0x7d, 0x4c, 0xf2, 0x99, 0xb2, 0xb6,
- 0x91, 0xad, 0xbf, 0x35, 0x53, 0xf8, 0x72, 0x8c, 0x8e, 0xce, 0x04, 0x78, 0x78, 0x0f, 0xf3, 0xc0,
- 0x60, 0x1e, 0xe9, 0xd0, 0xc7, 0xea, 0x1a, 0xa4, 0xf4, 0x9f, 0x35, 0xb0, 0x1c, 0xbb, 0xac, 0x70,
- 0x97, 0xc1, 0x37, 0xc1, 0x8a, 0x44, 0xec, 0x61, 0xbe, 0x27, 0x1b, 0xbc, 0x8a, 0x96, 0x63, 0xc7,
- 0x26, 0xe6, 0x7b, 0x30, 0x0f, 0x96, 0xdc, 0x88, 0x60, 0xc1, 0x22, 0x75, 0x8a, 0xe8, 0xc8, 0x84,
- 0x6f, 0x80, 0x45, 0xce, 0x06, 0x91, 0xab, 0x2a, 0x59, 0x41, 0x53, 0x2b, 0x46, 0x38, 0x03, 0xea,
- 0x7b, 0x24, 0xca, 0x67, 0x15, 0x62, 0x6a, 0xc2, 0xfb, 0x00, 0x26, 0x1b, 0xe1, 0xca, 0x73, 0xca,
- 0x2f, 0xcc, 0x7f, 0xa4, 0xd9, 0xf8, 0x48, 0xd1, 0xd9, 0x04, 0x89, 0xda, 0xd0, 0xff, 0xd2, 0xc0,
- 0xaa, 0xc1, 0x42, 0x11, 0x61, 0x57, 0x48, 0x4d, 0x97, 0xc0, 0x92, 0xd4, 0x44, 0x3d, 0xa9, 0x28,
- 0x5b, 0x07, 0x93, 0x71, 0x69, 0x51, 0x4a, 0x6e, 0xa0, 0xc5, 0x78, 0xcb, 0xf2, 0x8e, 0xd1, 0x76,
- 0x0e, 0x2c, 0x60, 0x2f, 0xa0, 0xe1, 0x54, 0x9a, 0x32, 0x62, 0xaf, 0x8f, 0x1d, 0xe2, 0x4f, 0x75,
- 0x29, 0x03, 0x1a, 0x53, 0x16, 0xe2, 0x4d, 0xa5, 0x5c, 0x7e, 0x9d, 0x14, 0x87, 0x33, 0x7f, 0x20,
- 0x48, 0x77, 0xd8, 0x66, 0x9c, 0x0a, 0xca, 0x42, 0x74, 0x84, 0x84, 0xef, 0x81, 0x53, 0xd4, 0x71,
- 0xed, 0x3e, 0x8b, 0x44, 0x5c, 0xf3, 0xa2, 0x1c, 0x98, 0xff, 0x4d, 0xc6, 0xa5, 0x15, 0xab, 0x6e,
- 0xb4, 0x59, 0x24, 0xac, 0x06, 0x5a, 0xa1, 0x8e, 0x2b, 0x97, 0xde, 0xed, 0xec, 0x1f, 0xf1, 0xb4,
- 0x7c, 0x95, 0x06, 0xf9, 0x23, 0xd5, 0xb1, 0xb4, 0x4d, 0xca, 0x05, 0x8b, 0x46, 0x66, 0x28, 0xa2,
- 0x11, 0xdc, 0x06, 0x2b, 0xac, 0x4f, 0x22, 0x2c, 0x66, 0x73, 0x7d, 0xeb, 0x35, 0x85, 0xbd, 0x82,
- 0xa3, 0x75, 0x04, 0x8d, 0x6f, 0x32, 0x9a, 0x31, 0x25, 0x1b, 0x9b, 0x7e, 0x6d, 0x63, 0x0d, 0xb0,
- 0x34, 0xe8, 0x7b, 0xb2, 0x25, 0x99, 0xff, 0xdc, 0x92, 0x29, 0x12, 0x56, 0x40, 0x26, 0xe0, 0x3d,
- 0xd9, 0xeb, 0xd5, 0xfa, 0xc5, 0x17, 0xe3, 0x52, 0x9e, 0x84, 0x2e, 0xf3, 0x68, 0xd8, 0xab, 0x7e,
- 0xc1, 0x59, 0x58, 0x41, 0xf8, 0xd1, 0x16, 0xe1, 0x1c, 0xf7, 0x08, 0x8a, 0x03, 0x75, 0x04, 0xe0,
- 0xcb, 0x74, 0x70, 0x1d, 0xac, 0x3a, 0x3e, 0x73, 0x1f, 0xd8, 0x7b, 0x84, 0xf6, 0xf6, 0x84, 0xba,
- 0x0d, 0xe8, 0x94, 0xf4, 0x6d, 0x4a, 0x17, 0xbc, 0x00, 0x96, 0xc5, 0xd0, 0xa6, 0xa1, 0x47, 0x86,
- 0x4a, 0x13, 0x5a, 0x12, 0x43, 0x2b, 0x36, 0x75, 0x0a, 0x16, 0xb6, 0x98, 0x47, 0x7c, 0x78, 0x17,
- 0x64, 0x1e, 0x90, 0x91, 0x9a, 0x8e, 0xfa, 0x47, 0x2f, 0xc6, 0xa5, 0x0f, 0x7a, 0x54, 0xec, 0x0d,
- 0x9c, 0x8a, 0xcb, 0x82, 0xaa, 0x20, 0xa1, 0x17, 0x4f, 0x6b, 0x28, 0x92, 0x4b, 0x9f, 0x3a, 0xbc,
- 0xea, 0x8c, 0x04, 0xe1, 0x95, 0x4d, 0x32, 0xac, 0xc7, 0x0b, 0x14, 0x93, 0xc4, 0xd7, 0x48, 0xbd,
- 0xd4, 0xd3, 0x72, 0xd6, 0x94, 0x71, 0xe5, 0x4f, 0x0d, 0x80, 0xd9, 0xcb, 0x03, 0x7e, 0x08, 0xce,
- 0xd7, 0x0c, 0xc3, 0xec, 0x74, 0xec, 0xee, 0x4e, 0xdb, 0xb4, 0xb7, 0x9b, 0x9d, 0xb6, 0x69, 0x58,
- 0x1f, 0x5b, 0x66, 0x23, 0x97, 0x2a, 0x5c, 0xd8, 0x3f, 0x28, 0xaf, 0xcd, 0x82, 0xb7, 0x43, 0xde,
- 0x27, 0x2e, 0xdd, 0xa5, 0xc4, 0x83, 0xd7, 0x00, 0x4c, 0xe2, 0x9a, 0xad, 0x7a, 0xab, 0xb1, 0x93,
- 0xd3, 0x0a, 0xe7, 0xf6, 0x0f, 0xca, 0xb9, 0x19, 0xa4, 0xc9, 0x1c, 0xe6, 0x8d, 0xe0, 0x2d, 0x90,
- 0x4f, 0x46, 0xb7, 0x9a, 0x9f, 0xec, 0xd8, 0xb5, 0x46, 0x03, 0x99, 0x9d, 0x4e, 0x2e, 0xfd, 0xef,
- 0x34, 0xad, 0xd0, 0x1f, 0xd5, 0xd4, 0xeb, 0x1a, 0xde, 0x04, 0x6b, 0x49, 0xa0, 0xf9, 0xa9, 0x89,
- 0x76, 0x64, 0xa6, 0x4c, 0xe1, 0xfc, 0xfe, 0x41, 0xf9, 0xff, 0x33, 0x94, 0xf9, 0x90, 0x44, 0xa3,
- 0x38, 0x59, 0x61, 0xf9, 0xcb, 0x1f, 0x8a, 0xa9, 0x27, 0x3f, 0x16, 0x53, 0x57, 0x7e, 0xca, 0x80,
- 0xf2, 0x49, 0x97, 0x0e, 0x12, 0x70, 0xdd, 0x68, 0x35, 0xbb, 0xa8, 0x66, 0x74, 0x6d, 0xa3, 0xd5,
- 0x30, 0xed, 0x4d, 0xab, 0xd3, 0x6d, 0xa1, 0x1d, 0xbb, 0xd5, 0x36, 0x51, 0xad, 0x6b, 0xb5, 0x9a,
- 0xaf, 0x6a, 0x4d, 0x75, 0xff, 0xa0, 0x7c, 0xf5, 0x24, 0xee, 0x64, 0xc3, 0xee, 0x81, 0xcb, 0x73,
- 0xa5, 0xb1, 0x9a, 0x56, 0x37, 0xa7, 0x15, 0x36, 0xf6, 0x0f, 0xca, 0x6f, 0x9f, 0xc4, 0x6f, 0x85,
- 0x54, 0xc0, 0xcf, 0xc1, 0xb5, 0xb9, 0x88, 0xb7, 0xac, 0x3b, 0xa8, 0xd6, 0x35, 0x73, 0xe9, 0xc2,
- 0xd5, 0xfd, 0x83, 0xf2, 0xbb, 0x27, 0x71, 0x6f, 0xd1, 0x5e, 0x84, 0x05, 0x99, 0x9b, 0xfe, 0x8e,
- 0xd9, 0x34, 0x3b, 0x56, 0x27, 0x97, 0x99, 0x8f, 0xfe, 0x0e, 0x09, 0x09, 0xa7, 0xbc, 0x90, 0x8d,
- 0x0f, 0xab, 0x8e, 0x9e, 0xfe, 0x56, 0x4c, 0x3d, 0x99, 0x14, 0xb5, 0xa7, 0x93, 0xa2, 0xf6, 0x6c,
- 0x52, 0xd4, 0x7e, 0x9d, 0x14, 0xb5, 0xaf, 0x9f, 0x17, 0x53, 0xcf, 0x9e, 0x17, 0x53, 0xbf, 0x3c,
- 0x2f, 0xa6, 0x3e, 0xbb, 0x9e, 0x98, 0x03, 0x83, 0xf1, 0x20, 0xfe, 0xb3, 0x91, 0x9f, 0x45, 0x5e,
- 0x75, 0x38, 0xfd, 0xfd, 0xe7, 0xf7, 0x91, 0xb3, 0x28, 0xbf, 0x76, 0xde, 0xff, 0x3b, 0x00, 0x00,
- 0xff, 0xff, 0xa8, 0x92, 0x2b, 0x20, 0x3f, 0x09, 0x00, 0x00,
+func init() { proto.RegisterFile("x/wasm/types/types.proto", fileDescriptor_8b85390a762df19f) }
+
+var fileDescriptor_8b85390a762df19f = []byte{
+ // 1119 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xcd, 0x8f, 0xdb, 0x44,
+ 0x14, 0x8f, 0x93, 0xec, 0xd7, 0x74, 0x69, 0xd3, 0xa1, 0x4b, 0xd3, 0x50, 0x92, 0xd4, 0xe5, 0x63,
+ 0xfb, 0x41, 0x42, 0x0b, 0xa2, 0xa8, 0xb7, 0xc4, 0x31, 0x5d, 0x57, 0x6c, 0x12, 0x4d, 0xb2, 0xb4,
+ 0x8b, 0x84, 0xac, 0xb1, 0x3d, 0x9b, 0x1d, 0x6a, 0x7b, 0x22, 0xcf, 0xa4, 0x4d, 0xfa, 0x17, 0xa0,
+ 0xe5, 0x82, 0x38, 0x71, 0x20, 0x12, 0x12, 0x08, 0xf5, 0x4f, 0xe9, 0x05, 0xa9, 0x47, 0x4e, 0x11,
+ 0xa4, 0x42, 0x82, 0xeb, 0x72, 0xeb, 0x09, 0x79, 0x26, 0xab, 0x58, 0xf4, 0x63, 0xc3, 0x25, 0x9a,
+ 0xf7, 0xe6, 0xfd, 0x7e, 0xef, 0xfd, 0xde, 0xcc, 0x73, 0x06, 0xe4, 0x87, 0xd5, 0x07, 0x98, 0x07,
+ 0x55, 0x31, 0xea, 0x13, 0xae, 0x7e, 0x2b, 0xfd, 0x88, 0x09, 0x06, 0x37, 0x5c, 0xc6, 0x83, 0x78,
+ 0xaf, 0x22, 0x7f, 0xee, 0x5f, 0x73, 0x88, 0xc0, 0xd7, 0x0a, 0x67, 0x7a, 0xac, 0xc7, 0x64, 0x44,
+ 0x35, 0x5e, 0xa9, 0x60, 0xdd, 0x01, 0xa7, 0x6a, 0xae, 0x4b, 0x38, 0xef, 0x8e, 0xfa, 0xa4, 0x8d,
+ 0x23, 0x1c, 0x40, 0x0b, 0x2c, 0xdd, 0xc7, 0xfe, 0x80, 0xe4, 0xb5, 0xb2, 0xb6, 0x79, 0xf2, 0xfa,
+ 0x85, 0xca, 0x0b, 0xf9, 0x2a, 0x73, 0x58, 0x3d, 0x77, 0x38, 0x29, 0xad, 0x8f, 0x70, 0xe0, 0xdf,
+ 0xd4, 0x25, 0x52, 0x47, 0x8a, 0xe1, 0x66, 0xf6, 0xfb, 0x1f, 0x4b, 0x9a, 0xfe, 0x83, 0x06, 0xd6,
+ 0x55, 0xb4, 0xc1, 0xc2, 0x3d, 0xda, 0x83, 0x77, 0x01, 0xe8, 0x93, 0x28, 0xa0, 0x9c, 0x53, 0x16,
+ 0x2e, 0x9e, 0x66, 0xe3, 0x70, 0x52, 0x3a, 0xad, 0xd2, 0xcc, 0xe1, 0x3a, 0x4a, 0x70, 0xc1, 0xab,
+ 0x60, 0x05, 0x7b, 0x5e, 0x44, 0x38, 0xcf, 0xa7, 0xcb, 0xda, 0xe6, 0x5a, 0x1d, 0x1e, 0x4e, 0x4a,
+ 0x27, 0x15, 0x66, 0xb6, 0xa1, 0xa3, 0xa3, 0x90, 0x59, 0x79, 0x7f, 0xa6, 0xc1, 0xb2, 0x54, 0xce,
+ 0xa1, 0x00, 0xd0, 0x65, 0x1e, 0xb1, 0x07, 0x7d, 0x9f, 0x61, 0xcf, 0xc6, 0x32, 0xb7, 0x2c, 0xf0,
+ 0xc4, 0xf5, 0x8b, 0xaf, 0x2c, 0x50, 0x29, 0xab, 0x5f, 0x78, 0x3c, 0x29, 0xa5, 0x0e, 0x27, 0xa5,
+ 0x73, 0x2a, 0xe5, 0xf3, 0x64, 0x3a, 0xca, 0xc5, 0xce, 0x1d, 0xe9, 0x53, 0x50, 0xf8, 0x9d, 0x06,
+ 0x8a, 0x34, 0xe4, 0x02, 0x87, 0x82, 0x62, 0x41, 0x6c, 0x8f, 0xec, 0xe1, 0x81, 0x2f, 0xec, 0x44,
+ 0x8f, 0xd2, 0x8b, 0xf6, 0xe8, 0xd2, 0xe1, 0xa4, 0xf4, 0x8e, 0x4a, 0xfe, 0x6a, 0x4a, 0x1d, 0x9d,
+ 0x4f, 0x04, 0x34, 0xd4, 0x7e, 0x7b, 0xde, 0xc9, 0xdb, 0x00, 0x06, 0x78, 0x68, 0xc7, 0x79, 0x6c,
+ 0x29, 0x83, 0xd3, 0x87, 0x24, 0x9f, 0x29, 0x6b, 0x9b, 0xd9, 0xfa, 0x5b, 0x73, 0x85, 0xcf, 0xc7,
+ 0xe8, 0xe8, 0x54, 0x80, 0x87, 0x77, 0x30, 0x0f, 0x0c, 0xe6, 0x91, 0x0e, 0x7d, 0xa8, 0xae, 0x41,
+ 0x4a, 0xff, 0x55, 0x03, 0xab, 0xb1, 0xcb, 0x0a, 0xf7, 0x18, 0x7c, 0x13, 0xac, 0x49, 0xc4, 0x3e,
+ 0xe6, 0xfb, 0xb2, 0xc1, 0xeb, 0x68, 0x35, 0x76, 0x6c, 0x61, 0xbe, 0x0f, 0xf3, 0x60, 0xc5, 0x8d,
+ 0x08, 0x16, 0x2c, 0x52, 0xa7, 0x88, 0x8e, 0x4c, 0xf8, 0x06, 0x58, 0xe6, 0x6c, 0x10, 0xb9, 0xaa,
+ 0x92, 0x35, 0x34, 0xb3, 0x62, 0x84, 0x33, 0xa0, 0xbe, 0x47, 0xa2, 0x7c, 0x56, 0x21, 0x66, 0x26,
+ 0xbc, 0x0b, 0x60, 0xb2, 0x11, 0xae, 0x3c, 0xa7, 0xfc, 0xd2, 0xe2, 0x47, 0x9a, 0x8d, 0x8f, 0x14,
+ 0x9d, 0x4e, 0x90, 0xa8, 0x0d, 0xfd, 0x1f, 0x0d, 0xac, 0x1b, 0x2c, 0x14, 0x11, 0x76, 0x85, 0xd4,
+ 0x74, 0x11, 0xac, 0x48, 0x4d, 0xd4, 0x93, 0x8a, 0xb2, 0x75, 0x30, 0x9d, 0x94, 0x96, 0xa5, 0xe4,
+ 0x06, 0x5a, 0x8e, 0xb7, 0x2c, 0xef, 0x15, 0xda, 0xce, 0x80, 0x25, 0xec, 0x05, 0x34, 0x9c, 0x49,
+ 0x53, 0x46, 0xec, 0xf5, 0xb1, 0x43, 0xfc, 0x99, 0x2e, 0x65, 0x40, 0x63, 0xc6, 0x42, 0xbc, 0x99,
+ 0x94, 0x4b, 0x2f, 0x93, 0xe2, 0x70, 0xe6, 0x0f, 0x04, 0xe9, 0x0e, 0xdb, 0x8c, 0x53, 0x41, 0x59,
+ 0x88, 0x8e, 0x90, 0xf0, 0x7d, 0x70, 0x82, 0x3a, 0xae, 0xdd, 0x67, 0x91, 0x88, 0x6b, 0x5e, 0x96,
+ 0x03, 0xf3, 0xda, 0x74, 0x52, 0x5a, 0xb3, 0xea, 0x46, 0x9b, 0x45, 0xc2, 0x6a, 0xa0, 0x35, 0xea,
+ 0xb8, 0x72, 0xe9, 0xdd, 0xcc, 0xfe, 0x15, 0x4f, 0xcb, 0x37, 0x69, 0x90, 0x3f, 0x52, 0x1d, 0x4b,
+ 0xdb, 0xa2, 0x5c, 0xb0, 0x68, 0x64, 0x86, 0x22, 0x1a, 0xc1, 0x1d, 0xb0, 0xc6, 0xfa, 0x24, 0xc2,
+ 0x62, 0x3e, 0xd7, 0x37, 0x5e, 0x52, 0xd8, 0x0b, 0x38, 0x5a, 0x47, 0xd0, 0xf8, 0x26, 0xa3, 0x39,
+ 0x53, 0xb2, 0xb1, 0xe9, 0x97, 0x36, 0xd6, 0x00, 0x2b, 0x83, 0xbe, 0x27, 0x5b, 0x92, 0xf9, 0xdf,
+ 0x2d, 0x99, 0x21, 0x61, 0x05, 0x64, 0x02, 0xde, 0x93, 0xbd, 0x5e, 0xaf, 0x9f, 0x7f, 0x36, 0x29,
+ 0xe5, 0x49, 0xe8, 0x32, 0x8f, 0x86, 0xbd, 0xea, 0x57, 0x9c, 0x85, 0x15, 0x84, 0x1f, 0x6c, 0x13,
+ 0xce, 0x71, 0x8f, 0xa0, 0x38, 0x50, 0x47, 0x00, 0x3e, 0x4f, 0x07, 0x2f, 0x80, 0x75, 0xc7, 0x67,
+ 0xee, 0x3d, 0x7b, 0x9f, 0xd0, 0xde, 0xbe, 0x50, 0xb7, 0x01, 0x9d, 0x90, 0xbe, 0x2d, 0xe9, 0x82,
+ 0xe7, 0xc0, 0xaa, 0x18, 0xda, 0x34, 0xf4, 0xc8, 0x50, 0x69, 0x42, 0x2b, 0x62, 0x68, 0xc5, 0xa6,
+ 0x4e, 0xc1, 0xd2, 0x36, 0xf3, 0x88, 0x0f, 0x6f, 0x83, 0xcc, 0x3d, 0x32, 0x52, 0xd3, 0x51, 0xff,
+ 0xe4, 0xd9, 0xa4, 0xf4, 0x51, 0x8f, 0x8a, 0xfd, 0x81, 0x53, 0x71, 0x59, 0x50, 0x15, 0x24, 0xf4,
+ 0xe2, 0x69, 0x0d, 0x45, 0x72, 0xe9, 0x53, 0x87, 0x57, 0x9d, 0x91, 0x20, 0xbc, 0xb2, 0x45, 0x86,
+ 0xf5, 0x78, 0x81, 0x62, 0x92, 0xf8, 0x1a, 0xa9, 0x8f, 0x7a, 0x5a, 0xce, 0x9a, 0x32, 0x2e, 0xff,
+ 0xad, 0x01, 0x30, 0xff, 0x78, 0xc0, 0x8f, 0xc1, 0xd9, 0x9a, 0x61, 0x98, 0x9d, 0x8e, 0xdd, 0xdd,
+ 0x6d, 0x9b, 0xf6, 0x4e, 0xb3, 0xd3, 0x36, 0x0d, 0xeb, 0x53, 0xcb, 0x6c, 0xe4, 0x52, 0x85, 0x73,
+ 0x07, 0xe3, 0xf2, 0xc6, 0x3c, 0x78, 0x27, 0xe4, 0x7d, 0xe2, 0xd2, 0x3d, 0x4a, 0x3c, 0x78, 0x15,
+ 0xc0, 0x24, 0xae, 0xd9, 0xaa, 0xb7, 0x1a, 0xbb, 0x39, 0xad, 0x70, 0xe6, 0x60, 0x5c, 0xce, 0xcd,
+ 0x21, 0x4d, 0xe6, 0x30, 0x6f, 0x04, 0x6f, 0x80, 0x7c, 0x32, 0xba, 0xd5, 0xfc, 0x6c, 0xd7, 0xae,
+ 0x35, 0x1a, 0xc8, 0xec, 0x74, 0x72, 0xe9, 0xff, 0xa6, 0x69, 0x85, 0xfe, 0xa8, 0xa6, 0x3e, 0xd7,
+ 0xf0, 0x3a, 0xd8, 0x48, 0x02, 0xcd, 0xcf, 0x4d, 0xb4, 0x2b, 0x33, 0x65, 0x0a, 0x67, 0x0f, 0xc6,
+ 0xe5, 0xd7, 0xe7, 0x28, 0xf3, 0x3e, 0x89, 0x46, 0x71, 0xb2, 0xc2, 0xea, 0xd7, 0x3f, 0x15, 0x53,
+ 0x8f, 0x7e, 0x2e, 0xa6, 0x2e, 0xff, 0x92, 0x01, 0xe5, 0xe3, 0x2e, 0x1d, 0x24, 0xe0, 0x03, 0xa3,
+ 0xd5, 0xec, 0xa2, 0x9a, 0xd1, 0xb5, 0x8d, 0x56, 0xc3, 0xb4, 0xb7, 0xac, 0x4e, 0xb7, 0x85, 0x76,
+ 0xed, 0x56, 0xdb, 0x44, 0xb5, 0xae, 0xd5, 0x6a, 0xbe, 0xa8, 0x35, 0xd5, 0x83, 0x71, 0xf9, 0xca,
+ 0x71, 0xdc, 0xc9, 0x86, 0xdd, 0x01, 0x97, 0x16, 0x4a, 0x63, 0x35, 0xad, 0x6e, 0x4e, 0x2b, 0x6c,
+ 0x1e, 0x8c, 0xcb, 0x6f, 0x1f, 0xc7, 0x6f, 0x85, 0x54, 0xc0, 0x2f, 0xc1, 0xd5, 0x85, 0x88, 0xb7,
+ 0xad, 0x5b, 0xa8, 0xd6, 0x35, 0x73, 0xe9, 0xc2, 0x95, 0x83, 0x71, 0xf9, 0xbd, 0xe3, 0xb8, 0xb7,
+ 0x69, 0x2f, 0xc2, 0x82, 0x2c, 0x4c, 0x7f, 0xcb, 0x6c, 0x9a, 0x1d, 0xab, 0x93, 0xcb, 0x2c, 0x46,
+ 0x7f, 0x8b, 0x84, 0x84, 0x53, 0x5e, 0xc8, 0xc6, 0x87, 0x55, 0xdf, 0x7a, 0xfc, 0x47, 0x31, 0xf5,
+ 0x68, 0x5a, 0xd4, 0x1e, 0x4f, 0x8b, 0xda, 0x93, 0x69, 0x51, 0xfb, 0x7d, 0x5a, 0xd4, 0xbe, 0x7d,
+ 0x5a, 0x4c, 0x3d, 0x79, 0x5a, 0x4c, 0xfd, 0xf6, 0xb4, 0x98, 0xfa, 0xe2, 0xdd, 0xc4, 0x1c, 0x18,
+ 0x8c, 0x07, 0xf1, 0x9f, 0x8d, 0x7c, 0x0d, 0x79, 0xd5, 0xe4, 0xab, 0xc8, 0x59, 0x96, 0x6f, 0x9c,
+ 0x0f, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xbc, 0x7e, 0xd9, 0x2c, 0x09, 0x00, 0x00,
}
func (this *AccessTypeParam) Equal(that interface{}) bool {
diff --git a/x/wasm/internal/types/types.proto b/x/wasm/types/types.proto
similarity index 98%
rename from x/wasm/internal/types/types.proto
rename to x/wasm/types/types.proto
index 0ea99dc245..64c538db1f 100644
--- a/x/wasm/internal/types/types.proto
+++ b/x/wasm/types/types.proto
@@ -3,7 +3,7 @@ package cosmwasm.wasm.v1beta1;
import "gogoproto/gogo.proto";
-option go_package = "github.com/CosmWasm/wasmd/x/wasmd/internal/types";
+option go_package = "github.com/CosmWasm/wasmd/x/wasm/types";
option (gogoproto.goproto_getters_all) = false;
option (gogoproto.equal_all) = true;
diff --git a/x/wasm/internal/types/types_test.go b/x/wasm/types/types_test.go
similarity index 100%
rename from x/wasm/internal/types/types_test.go
rename to x/wasm/types/types_test.go
diff --git a/x/wasm/internal/types/validation.go b/x/wasm/types/validation.go
similarity index 100%
rename from x/wasm/internal/types/validation.go
rename to x/wasm/types/validation.go
diff --git a/x/wasm/internal/types/wasmer_engine.go b/x/wasm/types/wasmer_engine.go
similarity index 100%
rename from x/wasm/internal/types/wasmer_engine.go
rename to x/wasm/types/wasmer_engine.go