From 34688ac35aaaff107f752fc8c077e8cdcc7948a7 Mon Sep 17 00:00:00 2001
From: zramsay <zach@monax.io>
Date: Fri, 25 Nov 2016 23:45:32 -0500
Subject: [PATCH] small tweaks to ease use as a library
---
client/cmd/genesis.go | 9 +++++++--
genesis/make_genesis_file.go | 16 +++++++---------
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/client/cmd/genesis.go b/client/cmd/genesis.go
index d0aa5e26..fcb4e8d9 100644
--- a/client/cmd/genesis.go
+++ b/client/cmd/genesis.go
@@ -1,6 +1,8 @@
package commands
import (
+ "fmt"
+
"github.com/eris-ltd/eris-db/genesis"
"github.com/spf13/cobra"
@@ -25,8 +27,11 @@ var GenesisGenCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
- genesis.GenerateKnown(args[0], AccountsPathFlag, ValidatorsPathFlag)
-
+ genesisFile, err := genesis.GenerateKnown(args[0], AccountsPathFlag, ValidatorsPathFlag)
+ if err != nil {
+ panic(err)
+ }
+ fmt.Println(genesisFile) // may want to save somewhere instead
},
}
diff --git a/genesis/make_genesis_file.go b/genesis/make_genesis_file.go
index 10de0530..79454fe9 100644
--- a/genesis/make_genesis_file.go
+++ b/genesis/make_genesis_file.go
@@ -20,23 +20,23 @@ import (
//------------------------------------------------------------------------------------
// core functions
-func GenerateKnown(chainID, accountsPathCSV, validatorsPathCSV string) error {
+func GenerateKnown(chainID, accountsPathCSV, validatorsPathCSV string) (string, error) {
var genDoc *stypes.GenesisDoc
// TODO [eb] eliminate reading priv_val ... [zr] where?
if accountsPathCSV == "" || validatorsPathCSV == "" {
- return fmt.Errorf("both accounts.csv and validators.csv is required")
+ return "", fmt.Errorf("both accounts.csv and validators.csv is required")
}
pubkeys, amts, names, perms, setbits, err := parseCsv(validatorsPathCSV)
if err != nil {
- return err
+ return "", err
}
pubkeysA, amtsA, namesA, permsA, setbitsA, err := parseCsv(accountsPathCSV)
if err != nil {
- return err
+ return "", err
}
genDoc = newGenDoc(chainID, len(pubkeys), len(pubkeysA))
@@ -50,15 +50,13 @@ func GenerateKnown(chainID, accountsPathCSV, validatorsPathCSV string) error {
buf, buf2, n := new(bytes.Buffer), new(bytes.Buffer), new(int)
wire.WriteJSON(genDoc, buf, n, &err)
if err != nil {
- return err
+ return "", err
}
if err := json.Indent(buf2, buf.Bytes(), "", "\t"); err != nil {
- return err
+ return "", err
}
- genesisString := buf2.String()
- fmt.Println(genesisString)
- return nil
+ return buf2.String(), nil
}
//-----------------------------------------------------------------------------
--
GitLab