From 35d2fb19a5d7b2e3d93e24c41e79a409f76fec95 Mon Sep 17 00:00:00 2001 From: Silas Davis <silas@erisindustries.com> Date: Tue, 4 Apr 2017 20:22:42 +0200 Subject: [PATCH] gofmt --- Dockerfile.deploy | 1 + cmd/serve.go | 2 +- manager/burrow-mint/accounts.go | 2 +- manager/burrow-mint/namereg.go | 2 +- manager/burrow-mint/pipe.go | 8 ++++---- manager/burrow-mint/transactor.go | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile.deploy b/Dockerfile.deploy index b1c5c0c8..68151c5e 100644 --- a/Dockerfile.deploy +++ b/Dockerfile.deploy @@ -3,6 +3,7 @@ MAINTAINER Monax <support@monax.io> ENV TARGET burrow + # Get the binary from the artefact in pwd/target/docker COPY ./target/docker/"$TARGET".dockerartefact $INSTALL_BASE/$TARGET RUN chmod +x --recursive $INSTALL_BASE diff --git a/cmd/serve.go b/cmd/serve.go index c4e69c82..86ab4d58 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -25,8 +25,8 @@ import ( "github.com/monax/burrow/definitions" "github.com/monax/burrow/logging" "github.com/monax/burrow/logging/lifecycle" - "github.com/monax/burrow/util" vm "github.com/monax/burrow/manager/burrow-mint/evm" + "github.com/monax/burrow/util" "github.com/spf13/cobra" ) diff --git a/manager/burrow-mint/accounts.go b/manager/burrow-mint/accounts.go index 7e0050e9..035586ee 100644 --- a/manager/burrow-mint/accounts.go +++ b/manager/burrow-mint/accounts.go @@ -36,7 +36,7 @@ var _ definitions.Accounts = (*accounts)(nil) // The accounts struct has methods for working with accounts. type accounts struct { - burrowMint *BurrowMint + burrowMint *BurrowMint filterFactory *event.FilterFactory } diff --git a/manager/burrow-mint/namereg.go b/manager/burrow-mint/namereg.go index bedfd168..3de4ed60 100644 --- a/manager/burrow-mint/namereg.go +++ b/manager/burrow-mint/namereg.go @@ -30,7 +30,7 @@ import ( // for the pipe to call into the BurrowMint application type namereg struct { - burrowMint *BurrowMint + burrowMint *BurrowMint filterFactory *event.FilterFactory } diff --git a/manager/burrow-mint/pipe.go b/manager/burrow-mint/pipe.go index 083198cb..0d7d7653 100644 --- a/manager/burrow-mint/pipe.go +++ b/manager/burrow-mint/pipe.go @@ -92,9 +92,9 @@ func NewBurrowMintPipe(moduleConfig *config.ModuleConfig, pipe := &burrowMintPipe{ burrowMintState: startedState, burrowMint: burrowMint, - accounts: accounts, - events: events, - namereg: namereg, + accounts: accounts, + events: events, + namereg: namereg, // We need to set transactor later since we are introducing a mutual dependency // NOTE: this will be cleaned up when the RPC is unified transactor: nil, @@ -257,7 +257,7 @@ func (pipe *burrowMintPipe) Subscribe(event string, pipe.consensusAndManagerEvents().Subscribe(subscriptionId, event, func(eventData txs.EventData) { result := rpc_tm_types.BurrowResult(&rpc_tm_types.ResultEvent{event, - txs.EventData(eventData)}) + txs.EventData(eventData)}) // NOTE: EventSwitch callbacks must be nonblocking rpcResponseWriter(result) }) diff --git a/manager/burrow-mint/transactor.go b/manager/burrow-mint/transactor.go index 67a95f07..0faa9bd8 100644 --- a/manager/burrow-mint/transactor.go +++ b/manager/burrow-mint/transactor.go @@ -38,7 +38,7 @@ import ( type transactor struct { chainID string eventSwitch tEvents.Fireable - burrowMint *BurrowMint + burrowMint *BurrowMint eventEmitter event.EventEmitter txMtx *sync.Mutex txBroadcaster func(tx txs.Tx) error -- GitLab