LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Move client context initialization from viper to separate package

Browse Source
This commit is contained in:
Christopher Goes
2018-04-03 22:16:03 +02:00
parent 0888096677
commit 7214149f1d
19 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/context/viper.go
+19
View File
@@ -0,0 +1,19 @@
package context
import (
"github.com/spf13/viper"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/core"
)
func NewCoreContextFromViper() core.CoreContext {
return core.CoreContext{
ChainID: viper.GetString(client.FlagChainID),
Height: viper.GetInt64(client.FlagHeight),
TrustNode: viper.GetBool(client.FlagTrustNode),
NodeURI: viper.GetString(client.FlagNode),
FromAddressName: viper.GetString(client.FlagName),
Sequence: viper.GetInt64(client.FlagSequence),
}
}
client/core/context.go
-20
View File
@@ -1,14 +1,5 @@
package core
import (
// "fmt"
// "github.com/pkg/errors"
"github.com/spf13/viper"
"github.com/cosmos/cosmos-sdk/client"
)
type CoreContext struct {
ChainID string
Height int64
@@ -18,17 +9,6 @@ type CoreContext struct {
Sequence int64
}
func NewCoreContextFromViper() CoreContext {
return CoreContext{
ChainID: viper.GetString(client.FlagChainID),
Height: viper.GetInt64(client.FlagHeight),
TrustNode: viper.GetBool(client.FlagTrustNode),
NodeURI: viper.GetString(client.FlagNode),
FromAddressName: viper.GetString(client.FlagName),
Sequence: viper.GetInt64(client.FlagSequence),
}
}
func (c CoreContext) WithChainID(chainID string) CoreContext {
c.ChainID = chainID
return c
client/rpc/block.go
+3 -3
View File
@@ -10,7 +10,7 @@ import (
"github.com/spf13/cobra"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/core"
"github.com/cosmos/cosmos-sdk/client/context"
)
const (
@@ -32,7 +32,7 @@ func blockCommand() *cobra.Command {
func getBlock(height *int64) ([]byte, error) {
// get the node
ctx := core.NewCoreContextFromViper()
ctx := context.NewCoreContextFromViper()
node, err := ctx.GetNode()
if err != nil {
return nil, err
@@ -57,7 +57,7 @@ func getBlock(height *int64) ([]byte, error) {
}
func GetChainHeight() (int64, error) {
node, err := core.NewCoreContextFromViper().GetNode()
node, err := context.NewCoreContextFromViper().GetNode()
if err != nil {
return -1, err
}
client/rpc/status.go
+2 -2
View File
@@ -10,7 +10,7 @@ import (
wire "github.com/tendermint/go-wire"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/core"
"github.com/cosmos/cosmos-sdk/client/context"
ctypes "github.com/tendermint/tendermint/rpc/core/types"
)
@@ -26,7 +26,7 @@ func statusCommand() *cobra.Command {
func getNodeStatus() (*ctypes.ResultStatus, error) {
// get the node
node, err := core.NewCoreContextFromViper().GetNode()
node, err := context.NewCoreContextFromViper().GetNode()
if err != nil {
return &ctypes.ResultStatus{}, err
}
client/rpc/validators.go
+2 -2
View File
@@ -10,7 +10,7 @@ import (
"github.com/spf13/cobra"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/core"
"github.com/cosmos/cosmos-sdk/client/context"
)
func validatorCommand() *cobra.Command {
@@ -27,7 +27,7 @@ func validatorCommand() *cobra.Command {
func GetValidators(height *int64) ([]byte, error) {
// get the node
node, err := core.NewCoreContextFromViper().GetNode()
node, err := context.NewCoreContextFromViper().GetNode()
if err != nil {
return nil, err
}
client/tx/broadcast.go
+2 -2
View File
@@ -4,7 +4,7 @@ import (
"encoding/json"
"net/http"
"github.com/cosmos/cosmos-sdk/client/core"
"github.com/cosmos/cosmos-sdk/client/context"
)
type BroadcastTxBody struct {
@@ -22,7 +22,7 @@ func BroadcastTxRequestHandler(w http.ResponseWriter, r *http.Request) {
return
}
res, err := core.NewCoreContextFromViper().BroadcastTx([]byte(m.TxBytes))
res, err := context.NewCoreContextFromViper().BroadcastTx([]byte(m.TxBytes))
if err != nil {
w.WriteHeader(500)
w.Write([]byte(err.Error()))
client/tx/query.go
+2 -2
View File
@@ -15,7 +15,7 @@ import (
ctypes "github.com/tendermint/tendermint/rpc/core/types"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/core"
"github.com/cosmos/cosmos-sdk/client/context"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/wire"
)
@@ -40,7 +40,7 @@ func (c commander) queryTx(hashHexStr string, trustNode bool) ([]byte, error) {
}
// get the node
node, err := core.NewCoreContextFromViper().GetNode()
node, err := context.NewCoreContextFromViper().GetNode()
if err != nil {
return nil, err
}
client/tx/search.go
+2 -2
View File
@@ -12,7 +12,7 @@ import (
ctypes "github.com/tendermint/tendermint/rpc/core/types"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/core"
"github.com/cosmos/cosmos-sdk/client/context"
"github.com/cosmos/cosmos-sdk/wire"
)
@@ -44,7 +44,7 @@ func (c commander) searchTx(tags []string) ([]byte, error) {
query := strings.Join(tags, " AND ")
// get the node
node, err := core.NewCoreContextFromViper().GetNode()
node, err := context.NewCoreContextFromViper().GetNode()
if err != nil {
return nil, err
}