TrueCloudLab/neo-go
8
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2025-05-04 09:02:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

rpc: return bse64 bytes from getblock, getblockheader, getrawtx

Browse source 
Close #1522
This commit is contained in:
Anna Shaleva 2020-11-06 17:37:58 +03:00
parent bdd073aad7
commit 6bb81d9b51
4 changed files with 22 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

24
pkg/rpc/client/rpc.go
View file

@ -68,7 +68,7 @@ func (c *Client) GetBlockByHash(hash util.Uint256) (*block.Block, error) {
func (c *Client) getBlock(params request.RawParams) (*block.Block, error) {
var (
resp string
resp []byte
err error
b *block.Block
)
@ -78,11 +78,7 @@ func (c *Client) getBlock(params request.RawParams) (*block.Block, error) {
if err = c.performRequest("getblock", params, &resp); err != nil {
return nil, err
}
blockBytes, err := hex.DecodeString(resp)
if err != nil {
return nil, err
}
r := io.NewBinReaderFromBuf(blockBytes)
r := io.NewBinReaderFromBuf(resp)
b = block.New(c.GetNetwork())
b.DecodeBinary(r)
if r.Err != nil {
@ -137,7 +133,7 @@ func (c *Client) GetBlockHash(index uint32) (util.Uint256, error) {
func (c *Client) GetBlockHeader(hash util.Uint256) (*block.Header, error) {
var (
params = request.NewRawParams(hash.StringLE())
resp string
resp []byte
h *block.Header
)
if !c.initDone {
@ -146,11 +142,7 @@ func (c *Client) GetBlockHeader(hash util.Uint256) (*block.Header, error) {
if err := c.performRequest("getblockheader", params, &resp); err != nil {
return nil, err
}
headerBytes, err := hex.DecodeString(resp)
if err != nil {
return nil, err
}
r := io.NewBinReaderFromBuf(headerBytes)
r := io.NewBinReaderFromBuf(resp)
h = new(block.Header)
h.Network = c.GetNetwork()
h.DecodeBinary(r)
@ -307,7 +299,7 @@ func (c *Client) GetRawMemPool() ([]util.Uint256, error) {
func (c *Client) GetRawTransaction(hash util.Uint256) (*transaction.Transaction, error) {
var (
params = request.NewRawParams(hash.StringLE())
resp string
resp []byte
err error
)
if !c.initDone {
@ -316,11 +308,7 @@ func (c *Client) GetRawTransaction(hash util.Uint256) (*transaction.Transaction,
if err = c.performRequest("getrawtransaction", params, &resp); err != nil {
return nil, err
}
txBytes, err := hex.DecodeString(resp)
if err != nil {
return nil, err
}
tx, err := transaction.NewTransactionFromBytes(c.GetNetwork(), txBytes)
tx, err := transaction.NewTransactionFromBytes(c.GetNetwork(), resp)
if err != nil {
return nil, err
}