Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rpc: Clarifying RPC getrawtransaction's time help text #14981

Merged

Conversation

Projects
None yet
6 participants
@benthecarman
Copy link
Contributor

commented Dec 17, 2018

#12339

The time and blocktime entries have the same value so they should have the same help text as well

@@ -130,7 +130,7 @@ static UniValue getrawtransaction(const JSONRPCRequest& request)
" ],\n"
" \"blockhash\" : \"hash\", (string) the block hash\n"
" \"confirmations\" : n, (numeric) The confirmations\n"
" \"time\" : ttt, (numeric) The transaction time in seconds since epoch (Jan 1 1970 GMT)\n"
" \"time\" : ttt, (numeric) The block time in seconds since epoch (Jan 1 1970 GMT)\n"
" \"blocktime\" : ttt (numeric) The block time in seconds since epoch (Jan 1 1970 GMT)\n"

This comment has been minimized.

Copy link
@laanwj

laanwj Dec 17, 2018

Member

concept ACK, the code is in TxToJSON:

                entry.pushKV("time", pindex->GetBlockTime());
                entry.pushKV("blocktime", pindex->GetBlockTime());

though instead of repeating the text I'd prefer Same as \"blocktime\"\n

@benthecarman benthecarman force-pushed the benthecarman:getrawtransaction_help_text_fix branch Dec 17, 2018

@promag

This comment has been minimized.

Copy link
Member

commented Dec 17, 2018

Concept ACK.

You have to rebase with master.

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Dec 17, 2018

utACK 845d14cff70c5da741952c2395adbead263516a5

@promag

This comment has been minimized.

Copy link
Member

commented Dec 17, 2018

utACK 845d14c.

@MarcoFalke MarcoFalke added this to the 0.18.0 milestone Dec 17, 2018

@promag

This comment has been minimized.

Copy link
Member

commented Dec 17, 2018

Invalid push? Reset to 845d14c?

@benthecarman

This comment has been minimized.

Copy link
Contributor Author

commented Dec 17, 2018

Invalid push? Reset to 845d14c?

Yeah my bad

@benthecarman benthecarman force-pushed the benthecarman:getrawtransaction_help_text_fix branch Dec 17, 2018

@benthecarman benthecarman force-pushed the benthecarman:getrawtransaction_help_text_fix branch to 84104c7 Dec 17, 2018

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Dec 17, 2018

No need to rebase. Could just force push the already reviewed commit?

@benthecarman

This comment has been minimized.

Copy link
Contributor Author

commented Dec 17, 2018

No need to rebase. Could just force push the already reviewed commit?

I thought the same thing but @promag asked for a rebase

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Dec 17, 2018

We had issues with travis earlier today, but it is possible to just reset a travis run without a rebase or otherwise touching the commit.

@benthecarman

This comment has been minimized.

Copy link
Contributor Author

commented Dec 17, 2018

I did not know that, but good to know

@benthecarman benthecarman changed the title Clarifying RPC getrawtransaction's time help text rpc: Clarifying RPC getrawtransaction's time help text Dec 18, 2018

@fanquake

This comment has been minimized.

Copy link
Member

commented Dec 28, 2018

utACK 84104c7

@MarcoFalke MarcoFalke merged commit 84104c7 into bitcoin:master Dec 28, 2018

2 checks passed

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

MarcoFalke added a commit that referenced this pull request Dec 28, 2018

Merge #14981: rpc: Clarifying RPC getrawtransaction's time help text
84104c7 clarifying getrawtransaction[time] get help text (Ben Carman)

Pull request description:

  #12339

  The `time` and `blocktime` entries have the same value so they should have the same help text as well

Tree-SHA512: 1e9a94678eec8501c761f16bf3d8e269d68620596d1fdd31a32989a1b53be5a8097ece8bfabe99979e658dec82237e37d8194ae2acd7c1deef7501ee701667fb

@benthecarman benthecarman deleted the benthecarman:getrawtransaction_help_text_fix branch Dec 29, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.