Skip to content

Conversation

@ch4ot1c
Copy link
Contributor

@ch4ot1c ch4ot1c commented Oct 29, 2018

Followup for #14459. See scripted-diff: commit messages for scripts used.

@ch4ot1c ch4ot1c force-pushed the fix/rpc-arg-types branch 2 times, most recently from d92b194 to 707854f Compare October 29, 2018 15:06
Copy link
Member

@maflcko maflcko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Concept ACK on making this consistent. Later improvements to make the documentation machine generated would be easier to review.

I don't have an opinion on the actual type name, but it should be consistent.

@maflcko maflcko added the Docs label Oct 29, 2018
@ch4ot1c ch4ot1c changed the title [rpc] Descriptions: Consistent arg labels for types 'object' and 'boolean' [rpc] Descriptions: Consistent arg labels for types 'object', 'array', 'boolean', and 'string' Oct 29, 2018
@DrahtBot
Copy link
Contributor

DrahtBot commented Oct 29, 2018

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #14796 (rpc: Pass argument descriptions to RPCHelpMan by MarcoFalke)
  • #14707 ([RPC] Include coinbase transactions in receivedby RPCs by andrewtoth)
  • #14481 (Add P2SH-P2WSH support to listunspent RPC by MeshCollider)
  • #13756 (wallet: "avoid_reuse" wallet flag for improved privacy by kallewoof)
  • #12911 (wallet: Show fee in results for signrawtransaction* for segwit inputs by kallewoof)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

…bject' and 'boolean'

-BEGIN VERIFY SCRIPT-

git grep -l "(bool) " src | xargs sed -i "s/(bool) /(boolean) /g"
git grep -l "(bool, " src/rpc | xargs sed -i "s/(bool, /(boolean, /g"
git grep -l "(bool, " src/wallet | xargs sed -i "s/(bool, /(boolean, /g"

git grep -l "(json object) " src | xargs sed -i "s/(json object) /(object) /g"
git grep -l "(json object, " src | xargs sed -i "s/(json object, /(object, /g"

git grep -l "(json array" src | xargs sed -i "s/(json array/(array/g"
git grep -l "of json objects" src | xargs sed -i "s/of json objects/of objects/g"

-END VERIFY SCRIPT-
…rray'

-BEGIN VERIFY SCRIPT-

git grep -l "of string)" src | xargs sed -i "s/of string)/of strings)/g"

-END VERIFY SCRIPT-
@DrahtBot
Copy link
Contributor

DrahtBot commented Dec 5, 2018

Needs rebase

@maflcko
Copy link
Member

maflcko commented Dec 5, 2018

Needs rebase, but should be simple for a scripted-diff. Also note that RPCHelpMan uses "json array" and "json object", as opposed to just "object"/"array".

@ch4ot1c
Copy link
Contributor Author

ch4ot1c commented Dec 14, 2018

Closing in favor of #14459.

@ch4ot1c ch4ot1c closed this Dec 14, 2018
laanwj added a commit that referenced this pull request Feb 5, 2020
fa5c662 doc: Use proper RPC help syntax in importmulti (MarcoFalke)
fab6311 doc: Remove duplicate "comment" from listsinceblock RPC help (MarcoFalke)
fa04cd6 doc: Properly document proxy_randomize_credentials as bool in getnetworkinfo (MarcoFalke)
fa9dec7 doc: Fix syntax error (trailing square bracket) in finalizepsbt (MarcoFalke)
faff5a6 doc: Fix syntax error (trailing square bracket) in walletprocesspsbt (MarcoFalke)
fa05459 doc: Add missing "optional" to "long" estimaterawfee RPC help (MarcoFalke)

Pull request description:

  This fixes documentation of the following RPCs:

  * estimaterawfee (hidden)
  * https://bitcoincore.org/en/doc/0.19.0/rpc/wallet/walletprocesspsbt/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/rawtransactions/finalizepsbt/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/network/getnetworkinfo/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/wallet/listsinceblock/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/wallet/importmulti/

  <!-- Also, it comes with a scripted diff to normalize whitespace and type names. (Previous attempts: #14601 and #14459)

ACKs for top commit:
  laanwj:
    ACK fa5c662

Tree-SHA512: 5a10956e12f8ce23e93a2ce8bafd6cae759d8a21658f79397e3bfce3e4aabd9658bdbd40acde49323dca958a9befee7166654994208c182dd60f483109621e17
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Feb 9, 2020
fa5c662 doc: Use proper RPC help syntax in importmulti (MarcoFalke)
fab6311 doc: Remove duplicate "comment" from listsinceblock RPC help (MarcoFalke)
fa04cd6 doc: Properly document proxy_randomize_credentials as bool in getnetworkinfo (MarcoFalke)
fa9dec7 doc: Fix syntax error (trailing square bracket) in finalizepsbt (MarcoFalke)
faff5a6 doc: Fix syntax error (trailing square bracket) in walletprocesspsbt (MarcoFalke)
fa05459 doc: Add missing "optional" to "long" estimaterawfee RPC help (MarcoFalke)

Pull request description:

  This fixes documentation of the following RPCs:

  * estimaterawfee (hidden)
  * https://bitcoincore.org/en/doc/0.19.0/rpc/wallet/walletprocesspsbt/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/rawtransactions/finalizepsbt/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/network/getnetworkinfo/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/wallet/listsinceblock/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/wallet/importmulti/

  <!-- Also, it comes with a scripted diff to normalize whitespace and type names. (Previous attempts: bitcoin#14601 and bitcoin#14459)

ACKs for top commit:
  laanwj:
    ACK fa5c662

Tree-SHA512: 5a10956e12f8ce23e93a2ce8bafd6cae759d8a21658f79397e3bfce3e4aabd9658bdbd40acde49323dca958a9befee7166654994208c182dd60f483109621e17
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Feb 17, 2020
…Normalize type names

fad027f scripted-diff: Add missing spaces in RPCResult, Fix type names (MarcoFalke)

Pull request description:

  This makes the rendered diff smaller when the RPCResult is machine generated later on (Previous attempts: bitcoin#14601 and bitcoin#14459)

ACKs for top commit:
  Sjors:
    ACK fad027f

Tree-SHA512: 48afd571b1cd349ca0b29bb444c1c7cda657e07dd96c610d479f931ccd938186aec98e533d0552b5b10afc9a3d7b911359260a49448e8e1106e3647b2c71f3ba
sidhujag pushed a commit to syscoin-core/syscoin that referenced this pull request Nov 10, 2020
fa5c662 doc: Use proper RPC help syntax in importmulti (MarcoFalke)
fab6311 doc: Remove duplicate "comment" from listsinceblock RPC help (MarcoFalke)
fa04cd6 doc: Properly document proxy_randomize_credentials as bool in getnetworkinfo (MarcoFalke)
fa9dec7 doc: Fix syntax error (trailing square bracket) in finalizepsbt (MarcoFalke)
faff5a6 doc: Fix syntax error (trailing square bracket) in walletprocesspsbt (MarcoFalke)
fa05459 doc: Add missing "optional" to "long" estimaterawfee RPC help (MarcoFalke)

Pull request description:

  This fixes documentation of the following RPCs:

  * estimaterawfee (hidden)
  * https://bitcoincore.org/en/doc/0.19.0/rpc/wallet/walletprocesspsbt/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/rawtransactions/finalizepsbt/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/network/getnetworkinfo/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/wallet/listsinceblock/
  * https://bitcoincore.org/en/doc/0.19.0/rpc/wallet/importmulti/

  <!-- Also, it comes with a scripted diff to normalize whitespace and type names. (Previous attempts: bitcoin#14601 and bitcoin#14459)

ACKs for top commit:
  laanwj:
    ACK fa5c662

Tree-SHA512: 5a10956e12f8ce23e93a2ce8bafd6cae759d8a21658f79397e3bfce3e4aabd9658bdbd40acde49323dca958a9befee7166654994208c182dd60f483109621e17
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants