[DEV-129] switch the locations in json between reqsigs and type (#63)

This commit is contained in:
Ori Newman 2018-09-23 11:27:38 +03:00 committed by stasatdaglabs
parent 21e9fde74d
commit d739bf5034
2 changed files with 4 additions and 4 deletions

View File

@ -55,8 +55,8 @@ type CreateMultiSigResult struct {
// DecodeScriptResult models the data returned from the decodescript command.
type DecodeScriptResult struct {
Asm string `json:"asm"`
ReqSigs int32 `json:"reqSigs,omitempty"`
Type string `json:"type"`
ReqSigs int32 `json:"reqSigs,omitempty"`
Addresses []string `json:"addresses,omitempty"`
P2sh string `json:"p2sh,omitempty"`
}
@ -270,8 +270,8 @@ type GetRawMempoolVerboseResult struct {
type ScriptPubKeyResult struct {
Asm string `json:"asm"`
Hex string `json:"hex,omitempty"`
ReqSigs int32 `json:"reqSigs,omitempty"`
Type string `json:"type"`
ReqSigs int32 `json:"reqSigs,omitempty"`
Addresses []string `json:"addresses,omitempty"`
}

View File

@ -82,8 +82,8 @@ var helpDescsEnUS = map[string]string{
// ScriptPubKeyResult help.
"scriptpubkeyresult-asm": "Disassembly of the script",
"scriptpubkeyresult-hex": "Hex-encoded bytes of the script",
"scriptpubkeyresult-reqSigs": "The number of required signatures",
"scriptpubkeyresult-type": "The type of the script (e.g. 'pubkeyhash')",
"scriptpubkeyresult-reqSigs": "The number of required signatures",
"scriptpubkeyresult-addresses": "The bitcoin addresses associated with this script",
// Vout help.
@ -104,8 +104,8 @@ var helpDescsEnUS = map[string]string{
// DecodeScriptResult help.
"decodescriptresult-asm": "Disassembly of the script",
"decodescriptresult-reqSigs": "The number of required signatures",
"decodescriptresult-type": "The type of the script (e.g. 'pubkeyhash')",
"decodescriptresult-reqSigs": "The number of required signatures",
"decodescriptresult-addresses": "The bitcoin addresses associated with this script",
"decodescriptresult-p2sh": "The script hash for use in pay-to-script-hash transactions (only present if the provided redeem script is not already a pay-to-script-hash script)",