From 6e801d33f0bd6fdbd621cad4f24ab0c6bbf7153b Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Fri, 13 Mar 2020 10:14:48 +0300 Subject: [PATCH] rpc: make a separate handler for every RPC Move getbestblockhash, getblockcount, getconnectioncount RPC. --- pkg/rpc/server/server.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/rpc/server/server.go b/pkg/rpc/server/server.go index 70ef1fa62..862d08e70 100644 --- a/pkg/rpc/server/server.go +++ b/pkg/rpc/server/server.go @@ -160,13 +160,13 @@ func (s *Server) methodHandler(w http.ResponseWriter, req *request.In, reqParams results, resultsErr = s.getApplicationLog(reqParams) case "getbestblockhash": - results = "0x" + s.chain.CurrentBlockHash().StringLE() + results, resultsErr = s.getBestBlockHash(reqParams) case "getblock": results, resultsErr = s.getBlock(reqParams) case "getblockcount": - results = s.chain.BlockHeight() + 1 + results, resultsErr = s.getBlockCount(reqParams) case "getblockhash": results, resultsErr = s.getBlockHash(reqParams) @@ -181,7 +181,7 @@ func (s *Server) methodHandler(w http.ResponseWriter, req *request.In, reqParams results, resultsErr = s.getClaimable(reqParams) case "getconnectioncount": - results = s.coreServer.PeerCount() + results, resultsErr = s.getConnectionCount(reqParams) case "getnep5balances": results, resultsErr = s.getNEP5Balances(reqParams) @@ -257,6 +257,18 @@ func (s *Server) methodHandler(w http.ResponseWriter, req *request.In, reqParams s.WriteResponse(req, w, results) } +func (s *Server) getBestBlockHash(_ request.Params) (interface{}, error) { + return "0x" + s.chain.CurrentBlockHash().StringLE(), nil +} + +func (s *Server) getBlockCount(_ request.Params) (interface{}, error) { + return s.chain.BlockHeight() + 1, nil +} + +func (s *Server) getConnectionCount(_ request.Params) (interface{}, error) { + return s.coreServer.PeerCount(), nil +} + func (s *Server) getBlock(reqParams request.Params) (interface{}, error) { var hash util.Uint256