From: iczc Date: Thu, 25 Jul 2019 06:47:44 +0000 (+0800) Subject: use address as parameter X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=253d916ceef8aec17bdce8658575c40ef889b826 use address as parameter --- diff --git a/toolbar/apinode/block.go b/toolbar/apinode/block.go index d8a1bbf0..50ac53f8 100644 --- a/toolbar/apinode/block.go +++ b/toolbar/apinode/block.go @@ -31,11 +31,11 @@ func (n *Node) getRawBlock(req *getRawBlockReq) (*types.Block, error) { return resp.RawBlock, n.request(url, payload, resp) } -func (n *Node) GetVoteByHash(hash string) ([]api.VoteInfo, error) { +func (n *Node) GetVoteByHash(hash string) ([]*api.VoteInfo, error) { return n.getVoteResult(&getVoteResultReq{BlockHash: hash}) } -func (n *Node) GetVoteByHeight(height uint64) ([]api.VoteInfo, error) { +func (n *Node) GetVoteByHeight(height uint64) ([]*api.VoteInfo, error) { return n.getVoteResult(&getVoteResultReq{BlockHeight: height}) } @@ -44,12 +44,12 @@ type getVoteResultReq struct { BlockHash string `json:"block_hash"` } -func (n *Node) getVoteResult(req *getVoteResultReq) ([]api.VoteInfo, error) { +func (n *Node) getVoteResult(req *getVoteResultReq) ([]*api.VoteInfo, error) { url := "/get-vote-result" payload, err := json.Marshal(req) if err != nil { return nil, errors.Wrap(err, "json marshal") } - resp := []api.VoteInfo{} + resp := []*api.VoteInfo{} return resp, n.request(url, payload, &resp) } diff --git a/toolbar/common/consensus.go b/toolbar/common/consensus.go index 014ee51b..50983b15 100644 --- a/toolbar/common/consensus.go +++ b/toolbar/common/consensus.go @@ -9,12 +9,12 @@ import ( const NumOfBPNode = 42 -func CalcStandByNodes(voteResult []api.VoteInfo) []api.VoteInfo { +func CalcStandByNodes(voteResult []*api.VoteInfo) []*api.VoteInfo { sort.Slice(voteResult, func(i, j int) bool { return voteResult[i].VoteNum > voteResult[j].VoteNum }) - result := []api.VoteInfo{} + result := []*api.VoteInfo{} for i := int(consensus.ActiveNetParams.NumOfConsensusNode); i < NumOfBPNode && i < len(voteResult); i++ { if voteResult[i].VoteNum < consensus.ActiveNetParams.MinConsensusNodeVoteNum { break