From 2fc9fba68a5ba8a67ffd778459b264c25d61d5af Mon Sep 17 00:00:00 2001
From: Silas Davis <silas@erisindustries.com>
Date: Thu, 26 Jan 2017 13:29:24 +0000
Subject: [PATCH] goimports everything
---
client/mock/client_mock.go | 2 +-
config/dump_config_test.go | 3 ++-
config/viper.go | 1 +
consensus/consensus.go | 2 +-
core/config.go | 1 +
definitions/pipe.go | 2 +-
docs/generator.go | 4 ++--
docs/generator/generator.go | 24 +++++++++++-----------
event/event_cache.go | 3 ++-
keys/key_client.go | 7 ++++---
logging/adapters/logrus/logrus.go | 3 +--
logging/adapters/stdlib/capture.go | 2 +-
logging/convention.go | 1 -
logging/loggers/channel_logger_test.go | 7 ++++---
logging/loggers/multiple_channel_logger.go | 8 ++++----
logging/structure/structure.go | 6 +++---
manager/eris-mint/state/state.go | 6 +++---
rpc/tendermint/client/client_test.go | 3 ++-
util/hell/cmd/hell/main.go | 6 +++---
util/hell/merge.go | 2 +-
util/os.go | 1 -
21 files changed, 49 insertions(+), 45 deletions(-)
diff --git a/client/mock/client_mock.go b/client/mock/client_mock.go
index 19781863..adcde24b 100644
--- a/client/mock/client_mock.go
+++ b/client/mock/client_mock.go
@@ -23,8 +23,8 @@ import (
. "github.com/eris-ltd/eris-db/client"
consensus_types "github.com/eris-ltd/eris-db/consensus/types"
core_types "github.com/eris-ltd/eris-db/core/types"
- "github.com/eris-ltd/eris-db/txs"
"github.com/eris-ltd/eris-db/logging/loggers"
+ "github.com/eris-ltd/eris-db/txs"
)
// NOTE [ben] Compiler check to ensure ErisMockClient successfully implements
diff --git a/config/dump_config_test.go b/config/dump_config_test.go
index ed71746c..4ea3dd05 100644
--- a/config/dump_config_test.go
+++ b/config/dump_config_test.go
@@ -6,12 +6,13 @@ package config
import (
"io/ioutil"
"testing"
+
"github.com/stretchr/testify/assert"
)
// This is a little convenience for getting a config file dump. Just run:
// go test -tags dumpconfig ./config
-// This pseudo test won't run unless the dumpconfig tag is
+// This pseudo test won't run unless the dumpconfig tag is
func TestDumpConfig(t *testing.T) {
bs, err := GetExampleConfigFileBytes()
assert.NoError(t, err, "Should be able to create example config")
diff --git a/config/viper.go b/config/viper.go
index fd56d89e..cb59f540 100644
--- a/config/viper.go
+++ b/config/viper.go
@@ -2,6 +2,7 @@ package config
import (
"fmt"
+
"github.com/spf13/viper"
)
diff --git a/consensus/consensus.go b/consensus/consensus.go
index 01fc2d12..2f4132d6 100644
--- a/consensus/consensus.go
+++ b/consensus/consensus.go
@@ -29,7 +29,7 @@ func LoadConsensusEngineInPipe(moduleConfig *config.ModuleConfig,
switch moduleConfig.Name {
case "tendermint":
tmint, err := tendermint.NewTendermint(moduleConfig, pipe.GetApplication(),
- pipe.Logger().With())
+ pipe.Logger().With())
if err != nil {
return fmt.Errorf("Failed to load Tendermint node: %v", err)
}
diff --git a/core/config.go b/core/config.go
index f9ffc6be..5a10047e 100644
--- a/core/config.go
+++ b/core/config.go
@@ -124,6 +124,7 @@ func LoadLoggingConfigFromClientDo(do *definitions.ClientDo) (*logging.LoggingCo
loggingConfig := &logging.LoggingConfig{}
return loggingConfig, nil
}
+
//------------------------------------------------------------------------------
// Helper functions
diff --git a/definitions/pipe.go b/definitions/pipe.go
index 68b4abc0..a32a4cdf 100644
--- a/definitions/pipe.go
+++ b/definitions/pipe.go
@@ -31,9 +31,9 @@ import (
core_types "github.com/eris-ltd/eris-db/core/types"
types "github.com/eris-ltd/eris-db/core/types"
event "github.com/eris-ltd/eris-db/event"
+ "github.com/eris-ltd/eris-db/logging/loggers"
manager_types "github.com/eris-ltd/eris-db/manager/types"
"github.com/eris-ltd/eris-db/txs"
- "github.com/eris-ltd/eris-db/logging/loggers"
)
type Pipe interface {
diff --git a/docs/generator.go b/docs/generator.go
index bd06bb6e..c3aa2387 100644
--- a/docs/generator.go
+++ b/docs/generator.go
@@ -7,13 +7,13 @@ import (
"strings"
"text/template"
- docs "github.com/eris-ltd/eris-db/docs/generator"
commands "github.com/eris-ltd/eris-db/cmd"
+ docs "github.com/eris-ltd/eris-db/docs/generator"
clientCommands "github.com/eris-ltd/eris-db/client/cmd"
+ "github.com/eris-ltd/eris-db/definitions"
"github.com/eris-ltd/eris-db/version"
"github.com/spf13/cobra"
- "github.com/eris-ltd/eris-db/definitions"
)
// Repository maintainers should customize the next two lines.
diff --git a/docs/generator/generator.go b/docs/generator/generator.go
index 08181213..fee2e3d5 100644
--- a/docs/generator/generator.go
+++ b/docs/generator/generator.go
@@ -8,8 +8,8 @@ import (
"os"
"path/filepath"
"regexp"
- "strings"
"strconv"
+ "strings"
"text/template"
)
@@ -148,7 +148,7 @@ func GenerateEntries(dir, render_dir, description string) ([]*Entry, error) {
return entries, nil
}
-func CollectEntries(dir string) ([]string) {
+func CollectEntries(dir string) []string {
var newFiles []string
files, err := filepath.Glob(dir + "/*")
@@ -179,8 +179,8 @@ func GenerateEntry(file, dir, render_dir, description string) (*Entry, error) {
var err error
this_entry := &Entry{
- FileName: GenerateFileNameFromGlob(render_dir, file),
- Title: GenerateTitleFromFileName(filepath.Base(file)),
+ FileName: GenerateFileNameFromGlob(render_dir, file),
+ Title: GenerateTitleFromFileName(filepath.Base(file)),
Description: description,
}
@@ -254,7 +254,7 @@ func GenerateEntriesTemplate(txt []byte) (*template.Template, error) {
panic(err)
}
- return ("```bash\n" + string(lines) + "```")
+ return ("```bash\n" + string(lines) + "```")
}
insert_file := func(file string) string {
@@ -283,14 +283,14 @@ func GenerateEntriesTemplate(txt []byte) (*template.Template, error) {
}
funcMap := template.FuncMap{
- "title": strings.Title,
- "replace": strings.Replace,
- "chomp": strings.TrimSpace,
- "handle_file": handle_file,
- "handle_link": handle_link,
+ "title": strings.Title,
+ "replace": strings.Replace,
+ "chomp": strings.TrimSpace,
+ "handle_file": handle_file,
+ "handle_link": handle_link,
"insert_definition": insert_definition,
"insert_bash_lines": insert_bash_lines,
- "insert_file": insert_file,
+ "insert_file": insert_file,
}
var templateText = `{{- $name := .Title -}}` + FrontMatter + `
@@ -330,4 +330,4 @@ func RenderEntry(this_entry *Entry) error {
}
return nil
-}
\ No newline at end of file
+}
diff --git a/event/event_cache.go b/event/event_cache.go
index 08db3011..7b6bc356 100644
--- a/event/event_cache.go
+++ b/event/event_cache.go
@@ -2,9 +2,10 @@ package event
import (
"fmt"
- "github.com/eris-ltd/eris-db/txs"
"sync"
"time"
+
+ "github.com/eris-ltd/eris-db/txs"
)
var (
diff --git a/keys/key_client.go b/keys/key_client.go
index f10093b8..2431bc64 100644
--- a/keys/key_client.go
+++ b/keys/key_client.go
@@ -19,8 +19,9 @@ package keys
import (
"encoding/hex"
"fmt"
- "github.com/eris-ltd/eris-db/logging/loggers"
+
"github.com/eris-ltd/eris-db/logging"
+ "github.com/eris-ltd/eris-db/logging/loggers"
)
type KeyClient interface {
@@ -37,7 +38,7 @@ var _ KeyClient = (*erisKeyClient)(nil)
type erisKeyClient struct {
rpcString string
- logger loggers.InfoTraceLogger
+ logger loggers.InfoTraceLogger
}
// erisKeyClient.New returns a new eris-keys client for provided rpc location
@@ -45,7 +46,7 @@ type erisKeyClient struct {
func NewErisKeyClient(rpcString string, logger loggers.InfoTraceLogger) *erisKeyClient {
return &erisKeyClient{
rpcString: rpcString,
- logger: logging.WithScope(logger, "ErisKeysClient"),
+ logger: logging.WithScope(logger, "ErisKeysClient"),
}
}
diff --git a/logging/adapters/logrus/logrus.go b/logging/adapters/logrus/logrus.go
index 708bac4d..fe974768 100644
--- a/logging/adapters/logrus/logrus.go
+++ b/logging/adapters/logrus/logrus.go
@@ -17,7 +17,6 @@ func NewLogrusLogger(logger logrus.Logger) *logrusLogger {
}
}
-func (ll *logrusLogger) Log(keyvals... interface{}) error {
+func (ll *logrusLogger) Log(keyvals ...interface{}) error {
return nil
}
-
diff --git a/logging/adapters/stdlib/capture.go b/logging/adapters/stdlib/capture.go
index dfa0a85f..b5fadacc 100644
--- a/logging/adapters/stdlib/capture.go
+++ b/logging/adapters/stdlib/capture.go
@@ -9,7 +9,7 @@ import (
)
func Capture(stdLibLogger log.Logger,
-logger loggers.InfoTraceLogger) io.Writer {
+ logger loggers.InfoTraceLogger) io.Writer {
adapter := newAdapter(logger)
stdLibLogger.SetOutput(adapter)
return adapter
diff --git a/logging/convention.go b/logging/convention.go
index ec833b96..0f5d3372 100644
--- a/logging/convention.go
+++ b/logging/convention.go
@@ -46,7 +46,6 @@ func Msg(logger kitlog.Logger, message string, keyvals ...interface{}) error {
return logger.Log(prepended...)
}
-
// Record a structured log line with a message and conventional keys
func MsgVals(logger kitlog.Logger, message string, vals ...interface{}) error {
keyvals := make([]interface{}, len(vals)*2)
diff --git a/logging/loggers/channel_logger_test.go b/logging/loggers/channel_logger_test.go
index 087bd5b4..14b50fa0 100644
--- a/logging/loggers/channel_logger_test.go
+++ b/logging/loggers/channel_logger_test.go
@@ -3,8 +3,9 @@ package loggers
import (
"testing"
- "github.com/stretchr/testify/assert"
"fmt"
+
+ "github.com/stretchr/testify/assert"
)
func TestChannelLogger(t *testing.T) {
@@ -27,6 +28,6 @@ func TestChannelLogger(t *testing.T) {
func TestBlether(t *testing.T) {
var bs []byte
- ext := append(bs, )
+ ext := append(bs)
fmt.Println(ext)
-}
\ No newline at end of file
+}
diff --git a/logging/loggers/multiple_channel_logger.go b/logging/loggers/multiple_channel_logger.go
index 9f68b4df..47ee9606 100644
--- a/logging/loggers/multiple_channel_logger.go
+++ b/logging/loggers/multiple_channel_logger.go
@@ -19,13 +19,13 @@ var _ kitlog.Logger = MultipleChannelLogger(nil)
func (mcl MultipleChannelLogger) Log(keyvals ...interface{}) error {
channel := structure.Value(keyvals, structure.ChannelKey)
if channel == nil {
- return fmt.Errorf("MultipleChannelLogger could not select channel because" +
- " '%s' was not set in log message", structure.ChannelKey)
+ return fmt.Errorf("MultipleChannelLogger could not select channel because"+
+ " '%s' was not set in log message", structure.ChannelKey)
}
channelName, ok := channel.(string)
if !ok {
- return fmt.Errorf("MultipleChannelLogger could not select channel because" +
- " channel was set to non-string value %v", channel)
+ return fmt.Errorf("MultipleChannelLogger could not select channel because"+
+ " channel was set to non-string value %v", channel)
}
logger := mcl[channelName]
if logger == nil {
diff --git a/logging/structure/structure.go b/logging/structure/structure.go
index 96aaa3f5..a104e8c9 100644
--- a/logging/structure/structure.go
+++ b/logging/structure/structure.go
@@ -65,7 +65,7 @@ type vectorValueindex struct {
// Location of the value belonging to a key in output slice
valueIndex int
// Whether or not the value is currently a vector
- vector bool
+ vector bool
}
// 'Vectorises' values associated with repeated string keys member by collapsing many values into a single vector value.
@@ -140,7 +140,7 @@ func MapKeyValues(keyvals []interface{}, fn func(interface{}, interface{}) (inte
for i := 0; i < 2*(len(keyvals)/2); i += 2 {
key := keyvals[i]
val := keyvals[i+1]
- mappedKeyvals[i], mappedKeyvals[i+1]= fn(key, val)
+ mappedKeyvals[i], mappedKeyvals[i+1] = fn(key, val)
}
return mappedKeyvals
-}
\ No newline at end of file
+}
diff --git a/manager/eris-mint/state/state.go b/manager/eris-mint/state/state.go
index 20106e33..941f7cb6 100644
--- a/manager/eris-mint/state/state.go
+++ b/manager/eris-mint/state/state.go
@@ -18,8 +18,8 @@ import (
"github.com/tendermint/go-wire"
core_types "github.com/eris-ltd/eris-db/core/types"
- "github.com/tendermint/tendermint/types"
"github.com/eris-ltd/eris-db/util"
+ "github.com/tendermint/tendermint/types"
)
var (
@@ -103,8 +103,8 @@ func (s *State) Save() {
if *err != nil {
// TODO: [Silas] Do something better than this, really serialising ought to
// be error-free
- util.Fatalf("Could not serialise state in order to save the state, " +
- "cannot continue, error: %s", *err)
+ util.Fatalf("Could not serialise state in order to save the state, "+
+ "cannot continue, error: %s", *err)
}
s.DB.Set(stateKey, buf.Bytes())
}
diff --git a/rpc/tendermint/client/client_test.go b/rpc/tendermint/client/client_test.go
index 52e0125e..3fe36f97 100644
--- a/rpc/tendermint/client/client_test.go
+++ b/rpc/tendermint/client/client_test.go
@@ -1,8 +1,9 @@
package client
import (
- "github.com/stretchr/testify/assert"
"testing"
+
+ "github.com/stretchr/testify/assert"
)
func TestMapsAndValues(t *testing.T) {
diff --git a/util/hell/cmd/hell/main.go b/util/hell/cmd/hell/main.go
index 879bfdef..6b1bba7f 100644
--- a/util/hell/cmd/hell/main.go
+++ b/util/hell/cmd/hell/main.go
@@ -6,15 +6,15 @@ import (
"path/filepath"
+ "github.com/Masterminds/glide/action"
"github.com/Masterminds/glide/cache"
"github.com/Masterminds/glide/cfg"
"github.com/Masterminds/glide/msg"
"github.com/Masterminds/glide/path"
+ "github.com/Masterminds/glide/repo"
"github.com/Masterminds/glide/util"
"github.com/eris-ltd/eris-db/util/hell"
"github.com/spf13/cobra"
- "github.com/Masterminds/glide/action"
- "github.com/Masterminds/glide/repo"
)
func main() {
@@ -74,7 +74,7 @@ func main() {
}
rootPackage, _ := util.NormalizeName(args[0])
// Add dependency to glide
- action.Get(args, repo.NewInstaller() , false, true, false, !interactive, false)
+ action.Get(args, repo.NewInstaller(), false, true, false, !interactive, false)
// Now hunt down the repo cache
dep := action.EnsureConfig().Imports.Get(rootPackage)
key, err := cache.Key(dep.Remote())
diff --git a/util/hell/merge.go b/util/hell/merge.go
index 242d22af..f8fa01b6 100644
--- a/util/hell/merge.go
+++ b/util/hell/merge.go
@@ -26,7 +26,7 @@ func MergeGlideLockFiles(baseLockFile, overrideLockFile *cfg.Lockfile) (*cfg.Loc
imports[lock.Name] = mergeLocks(imports[lock.Name], lock)
}
for _, lock := range overrideLockFile.DevImports {
- devImports[lock.Name] = mergeLocks(imports[lock.Name], lock)
+ devImports[lock.Name] = mergeLocks(imports[lock.Name], lock)
}
deps := make([]*cfg.Dependency, 0, len(imports))
diff --git a/util/os.go b/util/os.go
index 54f41b16..cc682918 100644
--- a/util/os.go
+++ b/util/os.go
@@ -10,4 +10,3 @@ func Fatalf(format string, args ...interface{}) {
fmt.Fprintf(os.Stderr, format, args...)
os.Exit(1)
}
-
--
GitLab