Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-10-14 00:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NOD-576] Rename NextHashes to ChildHashes in GetBlock/GetBlockHeaders rpc call (#645)

Browse Source 
* [NOD-576] Rename NextHashes to ChildHashes in GetBlock/GetBlockHeaders rpc call

* [NOD-576] Fix typo
This commit is contained in:
Ori Newman 2020-02-27 17:34:38 +02:00 committed by GitHub
parent 65cbb6655b
commit 2373965551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcmodel/rpc_results.go
View File

@ -22,7 +22,7 @@ type GetBlockHeaderVerboseResult struct {
Difficulty float64 `json:"difficulty"` Difficulty float64 `json:"difficulty"`
ParentHashes []string `json:"parentHashes,omitempty"` ParentHashes []string `json:"parentHashes,omitempty"`
SelectedParentHash string `json:"selectedParentHash"` SelectedParentHash string `json:"selectedParentHash"`
NextHashes []string `json:"nextHashes,omitempty"` ChildHashes []string `json:"childHashes,omitempty"`
} }
// GetBlockVerboseResult models the data from the getblock command when the // GetBlockVerboseResult models the data from the getblock command when the
@ -47,7 +47,7 @@ type GetBlockVerboseResult struct {
Difficulty float64 `json:"difficulty"` Difficulty float64 `json:"difficulty"`
ParentHashes []string `json:"parentHashes"` ParentHashes []string `json:"parentHashes"`
SelectedParentHash string `json:"selectedParentHash,omitempty"` SelectedParentHash string `json:"selectedParentHash,omitempty"`
NextHashes []string `json:"nextHashes,omitempty"` ChildHashes []string `json:"childHashes,omitempty"`
} }
// CreateMultiSigResult models the data returned from the createmultisig // CreateMultiSigResult models the data returned from the createmultisig

2
server/rpc/common.go
View File

@ -264,7 +264,7 @@ func buildGetBlockVerboseResult(s *Server, block *util.Block, isVerboseTx bool)
Size: int32(block.MsgBlock().SerializeSize()), Size: int32(block.MsgBlock().SerializeSize()),
Bits: strconv.FormatInt(int64(blockHeader.Bits), 16), Bits: strconv.FormatInt(int64(blockHeader.Bits), 16),
Difficulty: getDifficultyRatio(blockHeader.Bits, params), Difficulty: getDifficultyRatio(blockHeader.Bits, params),
NextHashes: childHashStrings, ChildHashes: childHashStrings,
} }
if isVerboseTx { if isVerboseTx {

2
server/rpc/handle_get_block_header.go
View File

@ -68,7 +68,7 @@ func handleGetBlockHeader(s *Server, cmd interface{}, closeChan <-chan struct{})
VersionHex: fmt.Sprintf("%08x", blockHeader.Version), VersionHex: fmt.Sprintf("%08x", blockHeader.Version),
HashMerkleRoot: blockHeader.HashMerkleRoot.String(), HashMerkleRoot: blockHeader.HashMerkleRoot.String(),
AcceptedIDMerkleRoot: blockHeader.AcceptedIDMerkleRoot.String(), AcceptedIDMerkleRoot: blockHeader.AcceptedIDMerkleRoot.String(),
NextHashes: childHashStrings, ChildHashes: childHashStrings,
ParentHashes: daghash.Strings(blockHeader.ParentHashes), ParentHashes: daghash.Strings(blockHeader.ParentHashes),
SelectedParentHash: selectedParentHash.String(), SelectedParentHash: selectedParentHash.String(),
Nonce: blockHeader.Nonce, Nonce: blockHeader.Nonce,

4
server/rpc/rpcserverhelp.go
View File

@ -267,7 +267,7 @@ var helpDescsEnUS = map[string]string{
"getBlockVerboseResult-difficulty": "The proof-of-work difficulty as a multiple of the minimum difficulty", "getBlockVerboseResult-difficulty": "The proof-of-work difficulty as a multiple of the minimum difficulty",
"getBlockVerboseResult-parentHashes": "The hashes of the parent blocks", "getBlockVerboseResult-parentHashes": "The hashes of the parent blocks",
"getBlockVerboseResult-selectedParentHash": "The selected parent hash", "getBlockVerboseResult-selectedParentHash": "The selected parent hash",
"getBlockVerboseResult-nextHashes": "The hashes of the next blocks (only if there are any)", "getBlockVerboseResult-childHashes": "The hashes of the child blocks (only if there are any)",
// GetBlockCountCmd help. // GetBlockCountCmd help.
"getBlockCount--synopsis": "Returns the number of blocks in the block DAG.", "getBlockCount--synopsis": "Returns the number of blocks in the block DAG.",
@ -295,7 +295,7 @@ var helpDescsEnUS = map[string]string{
"getBlockHeaderVerboseResult-difficulty": "The proof-of-work difficulty as a multiple of the minimum difficulty", "getBlockHeaderVerboseResult-difficulty": "The proof-of-work difficulty as a multiple of the minimum difficulty",
"getBlockHeaderVerboseResult-parentHashes": "The hashes of the parent blocks", "getBlockHeaderVerboseResult-parentHashes": "The hashes of the parent blocks",
"getBlockHeaderVerboseResult-selectedParentHash": "The selected parent hash", "getBlockHeaderVerboseResult-selectedParentHash": "The selected parent hash",
"getBlockHeaderVerboseResult-nextHashes": "The hashes of the next blocks (only if there are any)", "getBlockHeaderVerboseResult-childHashes": "The hashes of the child blocks (only if there are any)",
// TemplateRequest help. // TemplateRequest help.
"templateRequest-mode": "This is 'template', 'proposal', or omitted", "templateRequest-mode": "This is 'template', 'proposal', or omitted",