mleku/wasmd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All compiles except ./cmd

Browse Source
This commit is contained in:
Ethan Frey
2020-01-23 19:18:17 +01:00
parent 94667e9678
commit 06c3f0f253
5 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/app.go
View File

@@ -217,7 +217,7 @@ func NewWasmApp(
wasmWrap := WasmWrapper{Wasm: wasm.DefaultWasmConfig()}
err := viper.Unmarshal(&wasmWrap)
if err != nil {
fmt.Println("error while reading wasm config:", err.Error())
panic("error while reading wasm config: " + err.Error())
}
wasmConfig := wasmWrap.Wasm
@@ -232,7 +232,7 @@ func NewWasmApp(
// TODO: register evidence routes
evidenceKeeper.SetRouter(evidenceRouter)
app.evidenceKeeper = *evidenceKeeper
app.evidenceKeeper = evidenceKeeper
// register the proposal types
govRouter := gov.NewRouter()
@@ -267,7 +267,7 @@ func NewWasmApp(
evidence.NewAppModule(*app.evidenceKeeper),
wasm.NewAppModule(app.wasmKeeper),
upgrade.NewAppModule(app.upgradeKeeper),
evidence.NewAppModule(app.evidenceKeeper),
evidence.NewAppModule(*app.evidenceKeeper),
)
// During begin block slashing happens after distr.BeginBlocker so that
// there is nothing left over in the validator fee pool, so as to keep the
@@ -325,7 +325,7 @@ func NewWasmApp(
}
// Name returns the name of the App
func (app *GaiaApp) Name() string { return app.BaseApp.Name() }
func (app *WasmApp) Name() string { return app.BaseApp.Name() }
// application updates every begin block
func (app *WasmApp) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) abci.ResponseBeginBlock {

2
cli_test/test_helpers.go
View File

@@ -10,8 +10,6 @@ import (
"testing"
"time"
"github.com/cosmos/cosmos-sdk/client"
"github.com/stretchr/testify/require"
tmtypes "github.com/tendermint/tendermint/types"

5
x/wasm/client/cli/query.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/context"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -30,7 +31,7 @@ func GetQueryCmd(cdc *codec.Codec) *cobra.Command {
SuggestionsMinimumDistance: 2,
RunE: client.ValidateCmd,
}
queryCmd.AddCommand(client.GetCommands(
queryCmd.AddCommand(flags.GetCommands(
GetCmdListCode(cdc),
GetCmdQueryCode(cdc),
GetCmdListContracts(cdc),
@@ -157,7 +158,7 @@ func GetCmdGetContractState(cdc *codec.Codec) *cobra.Command {
SuggestionsMinimumDistance: 2,
RunE: client.ValidateCmd,
}
cmd.AddCommand(client.GetCommands(
cmd.AddCommand(flags.GetCommands(
GetCmdGetContractStateAll(cdc),
GetCmdGetContractStateRaw(cdc),
GetCmdGetContractStateSmart(cdc),

3
x/wasm/client/cli/tx.go
View File

@@ -11,6 +11,7 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/context"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/x/auth"
@@ -36,7 +37,7 @@ func GetTxCmd(cdc *codec.Codec) *cobra.Command {
SuggestionsMinimumDistance: 2,
RunE: client.ValidateCmd,
}
txCmd.AddCommand(client.PostCommands(
txCmd.AddCommand(flags.PostCommands(
StoreCodeCmd(cdc),
InstantiateContractCmd(cdc),
ExecuteContractCmd(cdc),

33
x/wasm/handler.go
View File

@@ -4,6 +4,7 @@ import (
"fmt"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
)
const (
@@ -13,7 +14,7 @@ const (
// NewHandler returns a handler for "bank" type messages.
func NewHandler(k Keeper) sdk.Handler {
return func(ctx sdk.Context, msg sdk.Msg) sdk.Result {
return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) {
ctx = ctx.WithEventManager(sdk.NewEventManager())
switch msg := msg.(type) {
@@ -34,20 +35,20 @@ func NewHandler(k Keeper) sdk.Handler {
default:
errMsg := fmt.Sprintf("unrecognized wasm message type: %T", msg)
return sdk.ErrUnknownRequest(errMsg).Result()
return nil, sdkerrors.Wrap(sdkerrors.ErrUnknownRequest, errMsg)
}
}
}
func handleStoreCode(ctx sdk.Context, k Keeper, msg *MsgStoreCode) sdk.Result {
sdkerr := msg.ValidateBasic()
if sdkerr != nil {
return sdk.ResultFromError(sdkerr)
func handleStoreCode(ctx sdk.Context, k Keeper, msg *MsgStoreCode) (*sdk.Result, error) {
err := msg.ValidateBasic()
if err != nil {
return nil, err
}
codeID, err := k.Create(ctx, msg.Sender, msg.WASMByteCode, msg.Source, msg.Builder)
if err != nil {
return sdk.ResultFromError(err)
return nil, err
}
ctx.EventManager().EmitEvent(
@@ -60,16 +61,16 @@ func handleStoreCode(ctx sdk.Context, k Keeper, msg *MsgStoreCode) sdk.Result {
),
)
return sdk.Result{
return &sdk.Result{
Data: []byte(fmt.Sprintf("%d", codeID)),
Events: ctx.EventManager().Events(),
}
}, nil
}
func handleInstantiate(ctx sdk.Context, k Keeper, msg *MsgInstantiateContract) sdk.Result {
func handleInstantiate(ctx sdk.Context, k Keeper, msg *MsgInstantiateContract) (*sdk.Result, error) {
contractAddr, err := k.Instantiate(ctx, msg.Code, msg.Sender, msg.InitMsg, msg.InitFunds)
if err != nil {
return sdk.ResultFromError(err)
return nil, err
}
ctx.EventManager().EmitEvent(
@@ -83,16 +84,16 @@ func handleInstantiate(ctx sdk.Context, k Keeper, msg *MsgInstantiateContract) s
),
)
return sdk.Result{
return &sdk.Result{
Data: contractAddr,
Events: ctx.EventManager().Events(),
}
}, nil
}
func handleExecute(ctx sdk.Context, k Keeper, msg *MsgExecuteContract) sdk.Result {
func handleExecute(ctx sdk.Context, k Keeper, msg *MsgExecuteContract) (*sdk.Result, error) {
res, err := k.Execute(ctx, msg.Contract, msg.Sender, msg.Msg, msg.SentFunds)
if err != nil {
return sdk.ResultFromError(err)
return nil, err
}
ctx.EventManager().EmitEvent(
@@ -106,5 +107,5 @@ func handleExecute(ctx sdk.Context, k Keeper, msg *MsgExecuteContract) sdk.Resul
)
res.Events = append(res.Events, ctx.EventManager().Events()...)
return res
return &res, nil
}