From 3235172a74b4f4428d1f2313c2ade93c4d92df44 Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Sun, 21 Feb 2016 15:09:47 -0800
Subject: [PATCH] Move main.go to cmd/main.go

---
 app/app.go               | 8 ++++----
 main.go => cmd/main.go   | 2 +-
 tests/tendermint/main.go | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename main.go => cmd/main.go (96%)

diff --git a/app/app.go b/app/app.go
index fd6c2638e..562634403 100644
--- a/app/app.go
+++ b/app/app.go
@@ -13,10 +13,10 @@ const version = "0.1"
 const maxTxSize = 10240
 
 type Basecoin struct {
-	eyesCli *eyes.MerkleEyesClient
+	eyesCli *eyes.Client
 }
 
-func NewBasecoin(eyesCli *eyes.MerkleEyesClient) *Basecoin {
+func NewBasecoin(eyesCli *eyes.Client) *Basecoin {
 	return &Basecoin{
 		eyesCli: eyesCli,
 	}
@@ -286,7 +286,7 @@ func execTx(tx types.Tx, accMap map[string]types.PubAccount, appendTx bool) (acc
 
 //----------------------------------------
 
-func loadAccounts(eyesCli *eyes.MerkleEyesClient, pubKeys []crypto.PubKey) (accMap map[string]types.PubAccount) {
+func loadAccounts(eyesCli *eyes.Client, pubKeys []crypto.PubKey) (accMap map[string]types.PubAccount) {
 	accMap = make(map[string]types.PubAccount, len(pubKeys))
 	for _, pubKey := range pubKeys {
 		keyString := pubKey.KeyString()
@@ -311,7 +311,7 @@ func loadAccounts(eyesCli *eyes.MerkleEyesClient, pubKeys []crypto.PubKey) (accM
 }
 
 // NOTE: accs must be stored in deterministic order.
-func storeAccounts(eyesCli *eyes.MerkleEyesClient, accs []types.PubAccount) {
+func storeAccounts(eyesCli *eyes.Client, accs []types.PubAccount) {
 	fmt.Println("STORE ACCOUNTS", accs)
 	for _, acc := range accs {
 		accBytes := wire.BinaryBytes(acc.Account)
diff --git a/main.go b/cmd/main.go
similarity index 96%
rename from main.go
rename to cmd/main.go
index 0285fce71..1afc7235e 100644
--- a/main.go
+++ b/cmd/main.go
@@ -19,7 +19,7 @@ func main() {
 	flag.Parse()
 
 	// Connect to MerkleEyes
-	eyesCli, err := eyes.NewMerkleEyesClient(*eyesPtr)
+	eyesCli, err := eyes.NewClient(*eyesPtr)
 	if err != nil {
 		Exit("connect to MerkleEyes: " + err.Error())
 	}
diff --git a/tests/tendermint/main.go b/tests/tendermint/main.go
index 34c82a671..4dc0e1ad5 100644
--- a/tests/tendermint/main.go
+++ b/tests/tendermint/main.go
@@ -15,8 +15,8 @@ import (
 )
 
 func main() {
-	//ws := rpcclient.NewWSClient("ws://127.0.0.1:46657/websocket")
-	ws := rpcclient.NewWSClient("ws://104.131.151.26:46657/websocket")
+	//ws := rpcclient.NewWSClient("ws://127.0.0.1:46657", "/websocket")
+	ws := rpcclient.NewWSClient("ws://104.131.151.26:46657", "/websocket")
 	_, err := ws.Start()
 	if err != nil {
 		Exit(err.Error())