basic go-linting // moved corecontext
This commit is contained in:
parent
1b9afdab48
commit
1f9184a24b
|
@ -114,7 +114,6 @@ func (app *BaseApp) SetEndBlocker(endBlocker sdk.EndBlocker) {
|
||||||
func (app *BaseApp) SetAnteHandler(ah sdk.AnteHandler) {
|
func (app *BaseApp) SetAnteHandler(ah sdk.AnteHandler) {
|
||||||
app.anteHandler = ah
|
app.anteHandler = ah
|
||||||
}
|
}
|
||||||
|
|
||||||
func (app *BaseApp) Router() Router { return app.router }
|
func (app *BaseApp) Router() Router { return app.router }
|
||||||
|
|
||||||
// load latest application version
|
// load latest application version
|
||||||
|
@ -337,7 +336,7 @@ func (app *BaseApp) DeliverTx(txBytes []byte) (res abci.ResponseDeliverTx) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Mostly for testing
|
// nolint- Mostly for testing
|
||||||
func (app *BaseApp) Check(tx sdk.Tx) (result sdk.Result) {
|
func (app *BaseApp) Check(tx sdk.Tx) (result sdk.Result) {
|
||||||
return app.runTx(true, nil, tx)
|
return app.runTx(true, nil, tx)
|
||||||
}
|
}
|
||||||
|
|
|
@ -240,7 +240,7 @@ func TestDeliverTx(t *testing.T) {
|
||||||
height := int64((counter / txPerHeight) + 1)
|
height := int64((counter / txPerHeight) + 1)
|
||||||
assert.Equal(t, height, thisHeader.Height)
|
assert.Equal(t, height, thisHeader.Height)
|
||||||
|
|
||||||
counter += 1
|
counter++
|
||||||
return sdk.Result{}
|
return sdk.Result{}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package core
|
package context
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
@ -141,17 +141,17 @@ func (ctx CoreContext) SignBuildBroadcast(name string, msg sdk.Msg, cdc *wire.Co
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the next sequence for the account address
|
// get the next sequence for the account address
|
||||||
func (c CoreContext) NextSequence(address []byte) (int64, error) {
|
func (ctx CoreContext) NextSequence(address []byte) (int64, error) {
|
||||||
if c.Decoder == nil {
|
if ctx.Decoder == nil {
|
||||||
return 0, errors.New("AccountDecoder required but not provided")
|
return 0, errors.New("AccountDecoder required but not provided")
|
||||||
}
|
}
|
||||||
|
|
||||||
res, err := c.Query(address, c.AccountStore)
|
res, err := ctx.Query(address, ctx.AccountStore)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return 0, err
|
return 0, err
|
||||||
}
|
}
|
||||||
|
|
||||||
account, err := c.Decoder(res)
|
account, err := ctx.Decoder(res)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
package core
|
package context
|
||||||
|
|
||||||
import (
|
import (
|
||||||
rpcclient "github.com/tendermint/tendermint/rpc/client"
|
rpcclient "github.com/tendermint/tendermint/rpc/client"
|
||||||
|
@ -6,6 +6,7 @@ import (
|
||||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// typical context created in sdk modules for transactions/queries
|
||||||
type CoreContext struct {
|
type CoreContext struct {
|
||||||
ChainID string
|
ChainID string
|
||||||
Height int64
|
Height int64
|
|
@ -2,6 +2,7 @@ package context
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
|
||||||
"github.com/spf13/viper"
|
"github.com/spf13/viper"
|
||||||
|
|
||||||
tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
|
tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands"
|
||||||
|
@ -9,11 +10,10 @@ import (
|
||||||
tmtypes "github.com/tendermint/tendermint/types"
|
tmtypes "github.com/tendermint/tendermint/types"
|
||||||
|
|
||||||
"github.com/cosmos/cosmos-sdk/client"
|
"github.com/cosmos/cosmos-sdk/client"
|
||||||
"github.com/cosmos/cosmos-sdk/client/core"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// NewCoreContextFromViper - return a new context with parameters from the command line
|
// NewCoreContextFromViper - return a new context with parameters from the command line
|
||||||
func NewCoreContextFromViper() core.CoreContext {
|
func NewCoreContextFromViper() CoreContext {
|
||||||
nodeURI := viper.GetString(client.FlagNode)
|
nodeURI := viper.GetString(client.FlagNode)
|
||||||
var rpc rpcclient.Client
|
var rpc rpcclient.Client
|
||||||
if nodeURI != "" {
|
if nodeURI != "" {
|
||||||
|
@ -27,7 +27,7 @@ func NewCoreContextFromViper() core.CoreContext {
|
||||||
chainID = def
|
chainID = def
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return core.CoreContext{
|
return CoreContext{
|
||||||
ChainID: chainID,
|
ChainID: chainID,
|
||||||
Height: viper.GetInt64(client.FlagHeight),
|
Height: viper.GetInt64(client.FlagHeight),
|
||||||
TrustNode: viper.GetBool(client.FlagTrustNode),
|
TrustNode: viper.GetBool(client.FlagTrustNode),
|
||||||
|
@ -54,7 +54,7 @@ func defaultChainID() (string, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// EnsureSequence - automatically set sequence number if none provided
|
// EnsureSequence - automatically set sequence number if none provided
|
||||||
func EnsureSequence(ctx core.CoreContext) (core.CoreContext, error) {
|
func EnsureSequence(ctx CoreContext) (CoreContext, error) {
|
||||||
if viper.IsSet(client.FlagSequence) {
|
if viper.IsSet(client.FlagSequence) {
|
||||||
return ctx, nil
|
return ctx, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,10 +28,9 @@ func waitForRPC() {
|
||||||
_, err := client.Call("status", map[string]interface{}{}, result)
|
_, err := client.Call("status", map[string]interface{}{}, result)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
return
|
return
|
||||||
} else {
|
|
||||||
fmt.Println("error", err)
|
|
||||||
time.Sleep(time.Millisecond)
|
|
||||||
}
|
}
|
||||||
|
fmt.Println("error", err)
|
||||||
|
time.Sleep(time.Millisecond)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -42,9 +42,9 @@ var (
|
||||||
coinAmount = int64(10000000)
|
coinAmount = int64(10000000)
|
||||||
|
|
||||||
// XXX bad globals
|
// XXX bad globals
|
||||||
|
name = "test"
|
||||||
|
password = "0123456789"
|
||||||
port string // XXX: but it's the int ...
|
port string // XXX: but it's the int ...
|
||||||
name string = "test"
|
|
||||||
password string = "0123456789"
|
|
||||||
seed string
|
seed string
|
||||||
sendAddr string
|
sendAddr string
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue