fix tests

glide.lock

@@ -1,5 +1,5 @@
 hash: 9096fc4e29eff8fac3708ed30deacac67b7a181f0192b177006105dccdb16686
-updated: 2017-04-21T18:34:16.345204981-04:00
+updated: 2017-04-21T18:39:37.154946943-04:00
 imports:
 - name: github.com/btcsuite/btcd
   version: 583684b21bfbde9b5fc4403916fd7c807feb0289
@@ -93,7 +93,7 @@ imports:
   subpackages:
   - term
 - name: github.com/tendermint/merkleeyes
-  version: 41fe51f4a6d3f1abc45fd4684e1351e084860ca4
+  version: 6fd69aa0871a4e685a5570aa7ab3d12e4068a722
   subpackages:
   - app
   - client

rpc/rpc_test.go

@@ -12,18 +12,18 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	wire "github.com/tendermint/go-wire"
 	client "github.com/tendermint/tendermint/rpc/client"
 	server "github.com/tendermint/tendermint/rpc/server"
 	types "github.com/tendermint/tendermint/rpc/types"
-	wire "github.com/tendermint/go-wire"
 )
 
 // Client and Server should work over tcp or unix sockets
 const (
 	tcpAddr = "tcp://0.0.0.0:46657"
 
-	unixSocket = "/tmp/tendermint/rpc.sock"
-	unixAddr   = "unix:///tmp/tendermint/rpc.sock"
+	unixSocket = "/tmp/rpc.sock"
+	unixAddr   = "unix:///tmp/rpc.sock"
 
 	websocketEndpoint = "/websocket/endpoint"
 )