From aaf27e9b1102ed114dfb8fddd667134400e23673 Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@monax.io>
Date: Mon, 20 Feb 2017 15:56:57 +0100
Subject: [PATCH] eris-mint: remove lingering genesis/types
---
manager/eris-mint/state/genesis_test.go | 2 +-
manager/eris-mint/state/types/genesis.go | 63 ------------------------
2 files changed, 1 insertion(+), 64 deletions(-)
delete mode 100644 manager/eris-mint/state/types/genesis.go
diff --git a/manager/eris-mint/state/genesis_test.go b/manager/eris-mint/state/genesis_test.go
index c9305ed4..47541d93 100644
--- a/manager/eris-mint/state/genesis_test.go
+++ b/manager/eris-mint/state/genesis_test.go
@@ -31,7 +31,7 @@ var g1 = fmt.Sprintf(`
{
"address": "%X",
"amount": %d,
- "name": "%s",
+ "name": "%s",
"permissions": {
"base": {
"perms": %d,
diff --git a/manager/eris-mint/state/types/genesis.go b/manager/eris-mint/state/types/genesis.go
deleted file mode 100644
index 90d54cf7..00000000
--- a/manager/eris-mint/state/types/genesis.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package types
-
-import (
- "fmt"
- "time"
-
- "github.com/eris-ltd/eris-db/common/sanity"
- ptypes "github.com/eris-ltd/eris-db/permission/types"
-
- "github.com/tendermint/go-crypto"
- "github.com/tendermint/go-wire"
-)
-
-//------------------------------------------------------------
-// we store the gendoc in the db
-
-var GenDocKey = []byte("GenDocKey")
-
-//------------------------------------------------------------
-// core types for a genesis definition
-
-type BasicAccount struct {
- Address []byte `json:"address"`
- Amount int64 `json:"amount"`
-}
-
-type GenesisAccount struct {
- Address []byte `json:"address"`
- Amount int64 `json:"amount"`
- Name string `json:"name"`
- Permissions *ptypes.AccountPermissions `json:"permissions"`
-}
-
-type GenesisValidator struct {
- PubKey crypto.PubKey `json:"pub_key"`
- Amount int64 `json:"amount"`
- Name string `json:"name"`
- UnbondTo []BasicAccount `json:"unbond_to"`
-}
-
-type GenesisParams struct {
- GlobalPermissions *ptypes.AccountPermissions `json:"global_permissions"`
-}
-
-type GenesisDoc struct {
- GenesisTime time.Time `json:"genesis_time"`
- ChainID string `json:"chain_id"`
- Params *GenesisParams `json:"params"`
- Accounts []GenesisAccount `json:"accounts"`
- Validators []GenesisValidator `json:"validators"`
-}
-
-//------------------------------------------------------------
-// Make genesis state from file
-
-func GenesisDocFromJSON(jsonBlob []byte) (genState *GenesisDoc) {
- var err error
- wire.ReadJSONPtr(&genState, jsonBlob, &err)
- if err != nil {
- sanity.PanicCrisis(fmt.Sprintf("Couldn't read GenesisDoc: %v", err))
- }
- return
-}
--
GitLab