From 48141ba64b3b56f63e6b7e4a996cde32875e648e Mon Sep 17 00:00:00 2001 From: Silas Davis <silas@erisindustries.com> Date: Mon, 10 Apr 2017 15:25:06 +0100 Subject: [PATCH] Apply goimports --- client/methods/helpers.go | 1 - client/websocket_client.go | 1 - config/config.go | 3 ++- logging/lifecycle/lifecycle.go | 1 + logging/loggers/channel_logger_test.go | 3 ++- logging/loggers/filter_logger_test.go | 3 ++- manager/burrow-mint/evm/vm.go | 1 + manager/manager.go | 1 - rpc/tendermint/test/rpc_client_test.go | 3 ++- util/snatives/templates/solidity_templates_test.go | 3 ++- 10 files changed, 12 insertions(+), 8 deletions(-) diff --git a/client/methods/helpers.go b/client/methods/helpers.go index 67a229cd..e0e4304d 100644 --- a/client/methods/helpers.go +++ b/client/methods/helpers.go @@ -20,7 +20,6 @@ import ( "github.com/monax/burrow/definitions" "github.com/monax/burrow/logging" "github.com/monax/burrow/logging/lifecycle" - "github.com/monax/burrow/logging/loggers" logging_types "github.com/monax/burrow/logging/types" ) diff --git a/client/websocket_client.go b/client/websocket_client.go index 157aef3d..a4ef9016 100644 --- a/client/websocket_client.go +++ b/client/websocket_client.go @@ -24,7 +24,6 @@ import ( "github.com/tendermint/go-wire" "github.com/monax/burrow/logging" - "github.com/monax/burrow/logging/loggers" ctypes "github.com/monax/burrow/rpc/tendermint/core/types" "github.com/monax/burrow/txs" ) diff --git a/config/config.go b/config/config.go index 225a007d..4afd56c9 100644 --- a/config/config.go +++ b/config/config.go @@ -17,8 +17,9 @@ package config import ( "bytes" "fmt" - lconfig "github.com/monax/burrow/logging/config" "text/template" + + lconfig "github.com/monax/burrow/logging/config" ) type ConfigServiceGeneral struct { diff --git a/logging/lifecycle/lifecycle.go b/logging/lifecycle/lifecycle.go index c71f0667..ede5b86b 100644 --- a/logging/lifecycle/lifecycle.go +++ b/logging/lifecycle/lifecycle.go @@ -23,6 +23,7 @@ import ( "github.com/monax/burrow/logging" "github.com/monax/burrow/logging/adapters/stdlib" tmLog15adapter "github.com/monax/burrow/logging/adapters/tendermint_log15" + "github.com/monax/burrow/logging/config" "github.com/monax/burrow/logging/loggers" "github.com/monax/burrow/logging/structure" diff --git a/logging/loggers/channel_logger_test.go b/logging/loggers/channel_logger_test.go index 5c1dc4c7..0badbde1 100644 --- a/logging/loggers/channel_logger_test.go +++ b/logging/loggers/channel_logger_test.go @@ -17,9 +17,10 @@ package loggers import ( "testing" + "time" + "github.com/eapache/channels" "github.com/stretchr/testify/assert" - "time" ) func TestChannelLogger(t *testing.T) { diff --git a/logging/loggers/filter_logger_test.go b/logging/loggers/filter_logger_test.go index e8ef3577..da298026 100644 --- a/logging/loggers/filter_logger_test.go +++ b/logging/loggers/filter_logger_test.go @@ -1,9 +1,10 @@ package loggers import ( + "testing" + . "github.com/monax/burrow/util/slice" "github.com/stretchr/testify/assert" - "testing" ) func TestFilterLogger(t *testing.T) { diff --git a/manager/burrow-mint/evm/vm.go b/manager/burrow-mint/evm/vm.go index cc1bce4c..c8af87b3 100644 --- a/manager/burrow-mint/evm/vm.go +++ b/manager/burrow-mint/evm/vm.go @@ -27,6 +27,7 @@ import ( ptypes "github.com/monax/burrow/permission/types" "github.com/monax/burrow/txs" . "github.com/monax/burrow/word256" + "github.com/monax/cli/log" "github.com/tendermint/go-events" ) diff --git a/manager/manager.go b/manager/manager.go index 092b676e..c8baf890 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -21,7 +21,6 @@ import ( config "github.com/monax/burrow/config" definitions "github.com/monax/burrow/definitions" - "github.com/monax/burrow/logging/types" burrowmint "github.com/monax/burrow/manager/burrow-mint" "github.com/monax/burrow/logging" diff --git a/rpc/tendermint/test/rpc_client_test.go b/rpc/tendermint/test/rpc_client_test.go index 7f44a39e..beceb548 100644 --- a/rpc/tendermint/test/rpc_client_test.go +++ b/rpc/tendermint/test/rpc_client_test.go @@ -20,10 +20,11 @@ package test import ( "bytes" "fmt" - "golang.org/x/crypto/ripemd160" "testing" "time" + "golang.org/x/crypto/ripemd160" + consensus_types "github.com/monax/burrow/consensus/types" edbcli "github.com/monax/burrow/rpc/tendermint/client" "github.com/monax/burrow/txs" diff --git a/util/snatives/templates/solidity_templates_test.go b/util/snatives/templates/solidity_templates_test.go index 82f73237..1e775187 100644 --- a/util/snatives/templates/solidity_templates_test.go +++ b/util/snatives/templates/solidity_templates_test.go @@ -16,9 +16,10 @@ package templates import ( "fmt" + "testing" + "github.com/monax/burrow/manager/burrow-mint/evm" "github.com/stretchr/testify/assert" - "testing" ) func TestSNativeFuncTemplate(t *testing.T) { -- GitLab