From 66e93f5163aa87621bdb4e4c59a800425b5b7d38 Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Sun, 16 Feb 2014 14:00:40 -0600 Subject: [PATCH] Switch over to new btcjson.GetRawMempoolResult. Rather than using a type specifically in btcd for the getrawmempool, this commit, along with a recent commit to btcjson, changes the code over to use the type from btcjson. This is more consistent with other RPC results and provides a few extra benefits such as the ability for btcjson to automatically unmarshal the results into a concrete type with proper field types as opposed to a generic interface. --- rpcserver.go | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/rpcserver.go b/rpcserver.go index 0b332e2a..f840ed7b 100644 --- a/rpcserver.go +++ b/rpcserver.go @@ -1082,28 +1082,15 @@ func handleGetPeerInfo(s *rpcServer, cmd btcjson.Cmd) (interface{}, error) { return s.server.PeerInfo(), nil } -// mempoolDescriptor describes a JSON object which is returned for each -// transaction in the memory pool in response to a getrawmempool command with -// the verbose flag set. -type mempoolDescriptor struct { - Size int `json:"size"` - Fee float64 `json:"fee"` - Time int64 `json:"time"` - Height int64 `json:"height"` - StartingPriority int `json:"startingpriority"` - CurrentPriority int `json:"currentpriority"` - Depends []string `json:"depends"` -} - // handleGetRawMempool implements the getrawmempool command. func handleGetRawMempool(s *rpcServer, cmd btcjson.Cmd) (interface{}, error) { c := cmd.(*btcjson.GetRawMempoolCmd) descs := s.server.txMemPool.TxDescs() if c.Verbose { - result := make(map[string]*mempoolDescriptor, len(descs)) + result := make(map[string]*btcjson.GetRawMempoolResult, len(descs)) for _, desc := range descs { - mpd := &mempoolDescriptor{ + mpd := &btcjson.GetRawMempoolResult{ Size: desc.Tx.MsgTx().SerializeSize(), Fee: float64(desc.Fee) / float64(btcutil.SatoshiPerBitcoin),