From 652a817fb803b59f13db00ae2baf4299873692dd Mon Sep 17 00:00:00 2001
From: Benjamin Bollen <ben@erisindustries.com>
Date: Thu, 30 Jun 2016 20:15:42 +0200
Subject: [PATCH] Complete Net implementation in ErisMintPipe for
rpc/tendermint
---
manager/eris-mint/pipe.go | 6 +++-
rpc/tendermint/core/net.go | 69 --------------------------------------
2 files changed, 5 insertions(+), 70 deletions(-)
delete mode 100644 rpc/tendermint/core/net.go
diff --git a/manager/eris-mint/pipe.go b/manager/eris-mint/pipe.go
index 58453970..75832015 100644
--- a/manager/eris-mint/pipe.go
+++ b/manager/eris-mint/pipe.go
@@ -112,6 +112,7 @@ func NewErisMintPipe(moduleConfig *config.ModuleConfig,
transactor: transactor,
network: newNetwork(),
consensus: nil,
+ // genesis cache
genesisDoc: genesisDoc,
genesisState: nil,
}, nil
@@ -260,7 +261,10 @@ func (pipe *ErisMintPipe) NetInfo() (*rpc_tendermint_types.ResultNetInfo, error)
}
func (pipe *ErisMintPipe) Genesis() (*rpc_tendermint_types.ResultGenesis, error) {
- return nil, fmt.Errorf("Unimplemented.")
+ return &rpc_tendermint_types.ResultGenesis {
+ // TODO: [ben] sharing pointer to unmutated GenesisDoc, but is not immutable
+ Genesis: pipe.genesisDoc,
+ }, nil
}
// Accounts
diff --git a/rpc/tendermint/core/net.go b/rpc/tendermint/core/net.go
deleted file mode 100644
index a515f3a4..00000000
--- a/rpc/tendermint/core/net.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package core
-
-import (
- ctypes "github.com/eris-ltd/eris-db/rpc/tendermint/core/types"
- sm "github.com/eris-ltd/eris-db/manager/eris-mint/state"
- // "github.com/tendermint/tendermint/types"
-
- // dbm "github.com/tendermint/go-db"
-)
-// TODO:[ben] remove commented code
-//-----------------------------------------------------------------------------
-
-// cache the genesis state
-var genesisState *sm.State
-
-// func Status() (*ctypes.ResultStatus, error) {
-// db := dbm.NewMemDB()
-// if genesisState == nil {
-// genesisState = sm.MakeGenesisState(db, genDoc)
-// }
-// genesisHash := genesisState.Hash()
-// latestHeight := blockStore.Height()
-// var (
-// latestBlockMeta *types.BlockMeta
-// latestBlockHash []byte
-// latestBlockTime int64
-// )
-// if latestHeight != 0 {
-// latestBlockMeta = blockStore.LoadBlockMeta(latestHeight)
-// latestBlockHash = latestBlockMeta.Hash
-// latestBlockTime = latestBlockMeta.Header.Time.UnixNano()
-// }
-//
-// return &ctypes.ResultStatus{
-// NodeInfo: p2pSwitch.NodeInfo(),
-// GenesisHash: genesisHash,
-// PubKey: privValidator.PubKey,
-// LatestBlockHash: latestBlockHash,
-// LatestBlockHeight: latestHeight,
-// LatestBlockTime: latestBlockTime}, nil
-// }
-
-//-----------------------------------------------------------------------------
-
-// func NetInfo() (*ctypes.ResultNetInfo, error) {
-// listening := p2pSwitch.IsListening()
-// listeners := []string{}
-// for _, listener := range p2pSwitch.Listeners() {
-// listeners = append(listeners, listener.String())
-// }
-// peers := []ctypes.Peer{}
-// for _, peer := range p2pSwitch.Peers().List() {
-// peers = append(peers, ctypes.Peer{
-// NodeInfo: *peer.NodeInfo,
-// IsOutbound: peer.IsOutbound(),
-// })
-// }
-// return &ctypes.ResultNetInfo{
-// Listening: listening,
-// Listeners: listeners,
-// Peers: peers,
-// }, nil
-// }
-
-//-----------------------------------------------------------------------------
-
-func Genesis() (*ctypes.ResultGenesis, error) {
- return &ctypes.ResultGenesis{genDoc}, nil
-}
--
GitLab