document script-based return fields for validateaddress #10676

Merged
merged 1 commit into from Jul 11, 2017

Conversation

Projects
None yet
4 participants
Member

instagibbs commented Jun 27, 2017

No description provided.

Owner

laanwj commented Jun 28, 2017

utACK f9dc6e5

laanwj self-assigned this Jun 28, 2017

src/rpc/misc.cpp
@@ -174,6 +174,14 @@ UniValue validateaddress(const JSONRPCRequest& request)
" \"ismine\" : true|false, (boolean) If the address is yours or not\n"
" \"iswatchonly\" : true|false, (boolean) If the address is watchonly\n"
" \"isscript\" : true|false, (boolean) If the key is a script\n"
+ " \"script\" : \"type\" (string, optional) The output script type. Possible types: nonstandard, pubkey, pubkeyhash, scripthash, multisig, nulldata, witness_v0_keyhash, witness_v0_scripthash\n"
@jonasschnelli

jonasschnelli Jun 28, 2017

Member

I guess this and L178 needs two whitespace more for the correct indentation...

@instagibbs

instagibbs Jun 28, 2017

Member

I don't see the mis-alignment here?

@jonasschnelli

jonasschnelli Jun 29, 2017

Member

L176 has two escapes (2x \") while this line has four escapes. I'd expect that it will be off by two whitespace against the other lines.

@instagibbs

instagibbs Jun 29, 2017

Member

I'm matching lines 185 through 187 at least, should those be indented further as well?

@jonasschnelli

jonasschnelli Jun 29, 2017

Member

This is how it looks. Mind the \".
bildschirmfoto 2017-06-29 um 20 57 24

Sorry for the bike-shed :)

Member

instagibbs commented Jun 30, 2017

@jonasschnelli nit addressed

@laanwj laanwj merged commit f2f1d0a into bitcoin:master Jul 11, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@laanwj laanwj added a commit that referenced this pull request Jul 11, 2017

@laanwj laanwj Merge #10676: document script-based return fields for validateaddress
f2f1d0a document script-based return fields for validateaddress (Gregory Sanders)

Tree-SHA512: 3310bb82b63ef20e46dd7ebcc9e15828cc7b6767ef19ddd869eeb5e4ee5b31ee307d21a44a9c81dbfe9d031bd48219e3ee1d330fc7b343d63d5365b68639c062
379aed0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment