diff --git a/client/mock/client_mock.go b/client/mock/client_mock.go
index 2cd9d8a16abf18404aaf8323193440738fb473d0..c8a31bc9e77fd0adeb047e34e1ca015f83701882 100644
--- a/client/mock/client_mock.go
+++ b/client/mock/client_mock.go
@@ -19,7 +19,7 @@ package mock
 import (
 	"github.com/tendermint/go-crypto"
 	"github.com/tendermint/go-p2p"
-	
+
 	rpc_types "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
 
 	acc "github.com/eris-ltd/eris-db/account"
@@ -75,11 +75,12 @@ func (mock *MockNodeClient) MockAddAccount(account *acc.Account) {
 func (mock *MockNodeClient) Status() (*rpc_types.ResultStatus, error) {
 	// make zero account
 	var zero [32]byte
-	pub := crypto.PubKey(crypto.PubKeyEd25519(zero))
+	ed25519 := crypto.PubKeyEd25519(zero)
+	pub := crypto.PubKey(ed25519)
 
 	// create a status
 	nodeInfo := &p2p.NodeInfo{
-		PubKey:     pub,
+		PubKey:     ed25519,
 		Moniker:    "Mock",
 		Network:    "MockNet",
 		RemoteAddr: "127.0.0.1",
@@ -95,5 +96,5 @@ func (mock *MockNodeClient) Status() (*rpc_types.ResultStatus, error) {
 		LatestBlockHash:   nil,
 		LatestBlockHeight: 1,
 		LatestBlockTime:   1,
-	}
+	}, nil
 }