rpc: use non-pointer Block and Transaction in results

Pointers can be nil and in some cases it's important to always have access to
Block or Transaction fields.
This commit is contained in:
Roman Khimov 2020-06-18 11:47:54 +03:00
parent a7cce3f894
commit 5fe8287fbb
4 changed files with 13 additions and 21 deletions

View file

@ -64,7 +64,7 @@ func getResultBlock1() *result.Block {
panic(err)
}
return &result.Block{
Block: b,
Block: *b,
BlockMetadata: result.BlockMetadata{
Size: 1681,
NextBlockHash: &b2Hash,
@ -85,7 +85,7 @@ func getTxMoveNeo() *result.TransactionOutputRaw {
panic(err)
}
return &result.TransactionOutputRaw{
Transaction: tx,
Transaction: *tx,
TransactionMetadata: result.TransactionMetadata{
Timestamp: b1.Timestamp,
Blockhash: b1.Block.Hash(),
@ -155,7 +155,7 @@ var rpcClientTestCases = map[string][]rpcClientTestCase{
serverResponse: `{"id":1,"jsonrpc":"2.0","result":"` + hexB1 + `"}`,
result: func(c *Client) interface{} {
b := getResultBlock1()
return b.Block
return &b.Block
},
},
{
@ -180,7 +180,7 @@ var rpcClientTestCases = map[string][]rpcClientTestCase{
serverResponse: `{"id":1,"jsonrpc":"2.0","result":"` + hexB1 + `"}`,
result: func(c *Client) interface{} {
b := getResultBlock1()
return b.Block
return &b.Block
},
},
{
@ -449,7 +449,7 @@ var rpcClientTestCases = map[string][]rpcClientTestCase{
serverResponse: `{"id":1,"jsonrpc":"2.0","result":"` + hexTxMoveNeo + `"}`,
result: func(c *Client) interface{} {
tx := getTxMoveNeo()
return tx.Transaction
return &tx.Transaction
},
},
{