From 653699f66db5297300fb46596206e66288abd4d5 Mon Sep 17 00:00:00 2001 From: HAOYUatHZ Date: Thu, 27 Jun 2019 15:50:32 +0800 Subject: [PATCH] clean up --- api/api.go | 2 -- api/nodeinfo.go | 10 ---------- config/config.go | 10 +++------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/api/api.go b/api/api.go index f0481c83..320aab98 100644 --- a/api/api.go +++ b/api/api.go @@ -114,7 +114,6 @@ type API struct { blockProposer *blockproposer.BlockProposer notificationMgr *websocket.WSNotificationManager eventDispatcher *event.Dispatcher - fedInfo *FedInfo } func (a *API) initServer(config *cfg.Config) { @@ -188,7 +187,6 @@ func NewAPI(sync NetSync, wallet *wallet.Wallet, blockProposer *blockproposer.Bl blockProposer: blockProposer, eventDispatcher: dispatcher, notificationMgr: notificationMgr, - fedInfo: &FedInfo{config.Federation.IsMember, config.Federation.Port}, } api.buildHandler() api.initServer(config) diff --git a/api/nodeinfo.go b/api/nodeinfo.go index a902026f..d521b8a7 100644 --- a/api/nodeinfo.go +++ b/api/nodeinfo.go @@ -52,16 +52,6 @@ func (a *API) GetNodeInfo() *NetInfo { return info } -type FedInfo struct { - IsMember bool `json:"is_member"` - Port uint64 `json:"port"` -} - -// GetFedInfo return federation information -func (a *API) GetFedInfo() *FedInfo { - return a.fedInfo -} - // return the currently connected peers with net address func (a *API) getPeerInfoByAddr(addr string) *peers.PeerInfo { peerInfos := a.sync.GetPeerInfos() diff --git a/config/config.go b/config/config.go index 3f58aa3f..5c70bf8a 100644 --- a/config/config.go +++ b/config/config.go @@ -203,10 +203,8 @@ type WebsocketConfig struct { } type FederationConfig struct { - Xpubs []chainkd.XPub `json:"xpubs"` - Quorum int `json:"quorum"` - IsMember bool `json:"is_member"` - Port uint64 `json:"port"` + Xpubs []chainkd.XPub `json:"xpubs"` + Quorum int `json:"quorum"` } // Default configurable rpc's auth parameters. @@ -245,9 +243,7 @@ func DefaultFederationConfig() *FederationConfig { Xpubs: []chainkd.XPub{ xpub("50ef22b3a3fca7bc08916187cc9ec2f4005c9c6b1353aa1decbd4be3f3bb0fbe1967589f0d9dec13a388c0412002d2c267bdf3b920864e1ddc50581be5604ce1"), }, - Quorum: 1, - IsMember: false, - Port: 3000, + Quorum: 1, } } -- 2.11.0