Merge basecoin with tendermint_classic

cmd/basecoin/main.go

@@ -4,9 +4,7 @@ import (
 	"flag"
 
 	"github.com/tendermint/basecoin/app"
-	"github.com/tendermint/basecoin/types"
 	. "github.com/tendermint/go-common"
-	"github.com/tendermint/go-wire"
 	eyes "github.com/tendermint/merkleeyes/client"
 	"github.com/tendermint/tmsp/server"
 )
@@ -15,7 +13,6 @@ func main() {
 
 	addrPtr := flag.String("address", "tcp://0.0.0.0:46658", "Listen address")
 	eyesPtr := flag.String("eyes", "tcp://0.0.0.0:46659", "MerkleEyes address")
-	genPtr := flag.String("genesis", "genesis.json", "Genesis JSON file")
 	flag.Parse()
 
 	// Connect to MerkleEyes
@@ -27,26 +24,6 @@ func main() {
 	// Create Basecoin app
 	app := app.NewBasecoin(eyesCli)
 
-	// Load GenesisState
-	jsonBytes, err := ReadFile(*genPtr)
-	if err != nil {
-		Exit("read genesis: " + err.Error())
-	}
-	genesisState := types.GenesisState{}
-	wire.ReadJSONPtr(&genesisState, jsonBytes, &err)
-	if err != nil {
-		Exit("parsing genesis JSON: " + err.Error())
-	}
-	for _, account := range genesisState.Accounts {
-		// pubKeyBytes := wire.BinaryBytes(account.PubKey)
-		pubKeyString := account.PubKey.KeyString()
-		accBytes := wire.BinaryBytes(account.Account)
-		err = eyesCli.SetSync([]byte(pubKeyString), accBytes)
-		if err != nil {
-			Exit("loading genesis accounts: " + err.Error())
-		}
-	}
-
 	// Start the listener
 	svr, err := server.NewServer(*addrPtr, app)
 	if err != nil {