diff --git a/Dockerfile.deploy b/Dockerfile.deploy index b1c5c0c80c518e1ec5e0eba925610f955bb64367..68151c5e3c63c4c4dea3ccc8d7185548dce147c0 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 c4e69c827518b59b6da2aaa82291c843a6071b85..86ab4d588c807c71dc73e2129ade1cfd50c59913 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 7e0050e93ac426f39cd7c37244324236cbbc9e28..035586ee19b309152f883811cd1f1134ae6b3880 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 bedfd16840e6ebb37836dd9818add5c89ea72c79..3de4ed6031ce0433ea76af90e26bfcb4a534d6bb 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 083198cbf404757f14a6e64541e2ab448998fda8..0d7d7653cdb620f605aad4aaedfa4518169b42b9 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 67a95f073676f6e18f9fd182af39927d7376b95d..0faa9bd8d125aa8d1377de3f33a5baac171dbcac 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