Merge PR #3557: Removing pkg/errors when not necessary

This commit is contained in:
Juan Leni
2019-02-08 11:37:46 -08:00
committed by Jack Zampolin
parent 7bc837aa06
commit ba63eb1801
19 changed files with 44 additions and 42 deletions
+1 -2
View File
@@ -3,7 +3,6 @@ package server
import (
"fmt"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"github.com/spf13/viper"
@@ -58,7 +57,7 @@ func ExportCmd(ctx *Context, cdc *codec.Codec, appExporter AppExporter) *cobra.C
jailWhiteList := viper.GetStringSlice(flagJailWhitelist)
appState, validators, err := appExporter(ctx.Logger, db, traceWriter, height, forZeroHeight, jailWhiteList)
if err != nil {
return errors.Errorf("error exporting state: %v\n", err)
return fmt.Errorf("error exporting state: %v", err)
}
doc, err := tmtypes.GenesisDocFromFile(ctx.Config.GenesisFile())
+3 -2
View File
@@ -1,7 +1,8 @@
package server
import (
"github.com/pkg/errors"
"fmt"
"github.com/spf13/cobra"
"github.com/spf13/viper"
@@ -76,7 +77,7 @@ func startStandAlone(ctx *Context, appCreator AppCreator) error {
svr, err := server.NewServer(addr, "socket", app)
if err != nil {
return errors.Errorf("error creating listener: %v\n", err)
return fmt.Errorf("error creating listener: %v", err)
}
svr.SetLogger(ctx.Logger.With("module", "abci-server"))
+2 -1
View File
@@ -9,7 +9,8 @@ import (
"syscall"
"time"
"github.com/pkg/errors"
"errors"
"github.com/spf13/cobra"
"github.com/spf13/viper"