From 7dccf61484939b81d4514317c90693742a8a187a Mon Sep 17 00:00:00 2001
From: Jae Kwon <jae@tendermint.com>
Date: Mon, 8 Feb 2016 02:19:32 -0800
Subject: [PATCH] Fix app

---
 app/app.go                    |  13 +++++++++----
 main.go                       |   7 +++----
 tests/tendermint/.main.go.swp | Bin 12288 -> 0 bytes
 tests/tendermint/main.go      |   4 ----
 4 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 tests/tendermint/.main.go.swp

diff --git a/app/app.go b/app/app.go
index cd21a71301..d7baf056ec 100644
--- a/app/app.go
+++ b/app/app.go
@@ -214,7 +214,7 @@ func sumAmounts(inputs []types.Input, outputs []types.Output, more int) (total u
 }
 
 func allPubKeys(tx types.Tx) (pubKeys []crypto.PubKey) {
-	pubKeys = make([]crypto.PubKey, len(tx.Inputs)+len(tx.Outputs))
+	pubKeys = make([]crypto.PubKey, 0, len(tx.Inputs)+len(tx.Outputs))
 	for _, input := range tx.Inputs {
 		pubKeys = append(pubKeys, input.PubKey)
 	}
@@ -278,13 +278,18 @@ func loadAccounts(eyesCli *eyes.MerkleEyesClient, pubKeys []crypto.PubKey) (accM
 		if err != nil {
 			panic("Error loading account: " + err.Error())
 		}
-		var acc types.PubAccount
+		if len(accBytes) == 0 {
+			continue
+		}
+		var acc types.Account
 		err = wire.ReadBinaryBytes(accBytes, &acc)
 		if err != nil {
 			panic("Error reading account: " + err.Error())
 		}
-		acc.PubKey = pubKey // Set volatile field
-		accMap[keyString] = acc
+		accMap[keyString] = types.PubAccount{
+			Account: acc,
+			PubKey:  pubKey,
+		}
 	}
 	return
 }
diff --git a/main.go b/main.go
index ffd1c50df4..fe4ea26605 100644
--- a/main.go
+++ b/main.go
@@ -2,7 +2,6 @@ package main
 
 import (
 	"flag"
-	"fmt"
 
 	"github.com/tendermint/blackstar/app"
 	"github.com/tendermint/blackstar/types"
@@ -39,13 +38,13 @@ func main() {
 		Exit("parsing genesis JSON: " + err.Error())
 	}
 	for _, account := range genesisState.Accounts {
-		pubKeyBytes := wire.BinaryBytes(account.PubKey)
+		// pubKeyBytes := wire.BinaryBytes(account.PubKey)
+		pubKeyString := account.PubKey.KeyString()
 		accBytes := wire.BinaryBytes(account.Account)
-		err = eyesCli.SetSync(pubKeyBytes, accBytes)
+		err = eyesCli.SetSync([]byte(pubKeyString), accBytes)
 		if err != nil {
 			Exit("loading genesis accounts: " + err.Error())
 		}
-		fmt.Println("Loaded ", account)
 	}
 
 	// Start the listener
diff --git a/tests/tendermint/.main.go.swp b/tests/tendermint/.main.go.swp
deleted file mode 100644
index 1ced6506665a950e8d59fa760e592ad81e5c9790..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2?`s@I7{{l@R<ByME%@_=lNDjFx$Iujn8s^UNJ?5;NgHx$ODQ4U+nc+rceiuS
z%y}2I_En+ae_%!GAK;5t1Yat?DiooDLJ<^vqrUKsA_x}rJF|D!?ImeTUs;(8A8u#%
z*=L^lJ~PiIWJ>vyN9O2WZx6xeX+o}T`~2kB*TT&oK2FG+0n@$r{2UFK9GMHk8P01X
z^MZSI9tQQbkG%(new&M$Yz86or3n3Mq*hubFXRnhvAE1cBZ`$@ss~|Bsz9JqDw)33
z2%^}l^0m%wk5#}bu(1LyRT-JwPWFtA=C#qw&Jf+T^TfvX_KsD+Dqt0`3RnfK0#*U5
zfK|XM@V`?)H8+v-nAPU)%+7YdHw}DuoA%2pU=^?mSOu&CRspMkRlq7>6|f3e1*`&A
zfrn6mpiIch7D66*6v5;F|7W{%_~R);eh0sTo8TL816%<Y!7?a-UEsGT3AqlMAO;Pv
z3@Es{osh4<RqzqG1U>-o0uHL+C^!Jdfe*HTP2koOg!~PD0-u4);5;}2UI$t556&t4
z0Iq|p;A3zBG{7R51Bbydcpm(<4gSFQ;9GD5d<nh)pMdwlX|NsqoFU{>a2Zs<B6tbB
z2%ZDaf?eRx#|ZfmTmcurB-jCdfu`SqOW-09paD*ULtq-b0G<Im!49w$=v>^|`VcNA
z8?sfvDqt1(PbqMYWZKdzD&BOngk*O6B$Gj3CZnPT^NMxG?rqU@jqzL*3NBg5<1*b%
zNAvl7Ry#7@GL?q%<^_(g)nhj@{ZWNRuV^beHAVCEo!hpvok+P%2ya#hF5GO-99?v1
zipEhrvDWRv6h-`}M5NdplQO6>x6MkDhc%|WMb=T>-W(O|t(jGvm^0q`;kb_Hm>%En
z_aQ`QXvoP?sSt71?LTP@do43`B$#)!c>I|0tPNW@lGiiS*V;-nL$%su(mTf53-bpT
z5-ZoK1T_|wF^*FbJSc~ORLiP^_OuXgsZ}{sm|RLG@B6A_hS2U-SjU@<LtbW!yqH92
zjN>IUa4CudvFgo4)!Dcl1+h2ZQYRq%#JKjEqpjpRGM+13&`3MY@1y%@G(2pS^?f>r
z*l0jYtvFnvyrR|9(~%_O@5VaONi~TzxpLajA4<`_^ga6mb?7i1$R#pAkje+oWGZdF
zRNj$C#9e@*>u82M$$HSL^%{3iYFC5@&S^J^iSnrp;i%3AL8hNbErGUPcQYo@$;wk5
zJqzT`?1Y~BNK{7Z#Kj?_!&7v$m$h>_Tp@$WS7y4wTd^vbJ&O(5?VWFx-e9W*+7!{-
z(_yGhu$FXRVvwxq<1N)}DYJW%OIe_2me$-G7_r!msz7`34TM6w!Hf+AL#g0=y*Q4<
zy)evGDvJIc)zO(tLR;+UkW*9Bw^B`cCR!qy^!AA8ep+X-n>Nb!_Y9;j;)pH{c@#^k
zIAsAgPLRlkJfxp8QRvO&Ed+77E3I^OEzI?EKy~$8XCuzv&IUGPPd)8YZ){gTr4_n8
zM(Tk>f;WmR6im5}Hqw<3LmXy`sugCGO@(|8Z-nkHAJ|e-uhyA*i@E&@DYHqXN~(QH
zu%M=w7`FNluO;PLFqxxhAk_UMDB255w(3eAT!En$8VRX#T0zBev$}!E7FbZevkJ*3
zk0q1c612{nVoh;b&Y5b1QO%1k5K7Mr&f8Llg5n(3BZjq&>U^qr&|JGtTNZqOG(YZ*
z?V0c<Uh_uBCJW;e6R+;|`!!ChcOO2+_Ii2zjIQ&zo-5U7w#|eI{4G;w{X^fW^WTWr
z54m8zS;-DHI#na7n4sqMl4wK^Kt8Q-vf@c*1J6}HqRWYMHv>InGTObY5-s7(+h`^j
z4+q*CJl=T3)CqU}-n=hEy`KgQt6W6&dXUN(mW_k8tnE+}c^U64AFl?7M2#jFin{nS
N9f#}jTZBmq`4{$bFWmqD

diff --git a/tests/tendermint/main.go b/tests/tendermint/main.go
index 835e42bfa8..81d595f07e 100644
--- a/tests/tendermint/main.go
+++ b/tests/tendermint/main.go
@@ -61,18 +61,14 @@ func main() {
 
 		// Sign request
 		signBytes := wire.BinaryBytes(tx)
-		fmt.Printf("SIGN: %X\n", signBytes)
 		sig := root.PrivKey.Sign(signBytes)
-		fmt.Println("VERIFY: ", root.PubKey.VerifyBytes(signBytes, sig))
 		tx.Inputs[0].Signature = sig
 		//fmt.Println("tx:", tx)
 
 		// Write request
 		txBytes := wire.BinaryBytes(tx)
-		fmt.Println("tx:", hex.EncodeToString(txBytes))
 		request := rpctypes.NewRPCRequest("fakeid", "broadcast_tx_sync", Arr(txBytes))
 		reqBytes := wire.JSONBytes(request)
-		fmt.Println("req:", hex.EncodeToString(reqBytes))
 		//fmt.Print(".")
 		err := ws.WriteMessage(websocket.TextMessage, reqBytes)
 		if err != nil {