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

Backports 0.15 pr5 #2647

Merged
merged 12 commits into from
Feb 4, 2019
Merged

Conversation

PastaPastaPasta
Copy link
Member

No description provided.

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

see inline suggestions to dashify few strings + permissions on qa/rpc-tests/wallet-hd.py are broken

qa/rpc-tests/bip68-sequence.py Outdated Show resolved Hide resolved
qa/rpc-tests/test_framework/util.py Outdated Show resolved Hide resolved
qa/rpc-tests/test_framework/util.py Outdated Show resolved Hide resolved
qa/rpc-tests/test_framework/util.py Outdated Show resolved Hide resolved
@UdjinM6 UdjinM6 added this to the 14.0 milestone Jan 25, 2019
UdjinM6
UdjinM6 previously approved these changes Jan 25, 2019
Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

Looks good 👍(Travis failures seem to be unrelated)

utACK

Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

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

See inline comments

contrib/devtools/github-merge.py Show resolved Hide resolved
qa/rpc-tests/test_framework/util.py Show resolved Hide resolved
@PastaPastaPasta
Copy link
Member Author

I redid bitcoin#9905 and bitcoin#9832 after rebasing on latest develop, I dropped redirect_stderr as stderr param was introduced. Also, bitcoin#9871 is there, but was in pr3/4 and this wasn't based on one of those

@codablock
Copy link

codablock commented Feb 1, 2019

c7cf788 now removes redirect_stderr from start_node, but the parameter is still used in many tests. I assume tests will fail because of this...but currently they fail for other reasons (permission errors)

@PastaPastaPasta
Copy link
Member Author

I'm not seeing it being used in any tests @codablock, tests passing locally

@codablock
Copy link

@PastaPastaPasta Just as an example:

self.nodes = start_nodes(self.num_nodes, self.options.tmpdir, self.extra_args, timewait=60, redirect_stderr=True)

Just do a global search for redirect_stderr and you'll find many more. Wondering how it can pass locally with redirect_stderr being ignored...it should even crash as it's an unknown named parameter now...
I also noticed that initialize_chain also has this parameter.

90a1d9a Docs: add details to -rpcclienttimeout doc (Ian Kelling)

Tree-SHA512: 7f9524f279a54b4d902674740d92624785abd54865aba82f7261151ceda50b5d51bf4d91c4fc0360168e190f8df890cc141bea5e1a9f4f2e62b8f9effda212cc
ad1ae7a Check and enable -Wshadow by default. (Pavel Janík)
9de90bb Do not shadow variables (gcc set) (Pavel Janík)

Tree-SHA512: 9517feb423dc8ddd63896016b25324673bfbe0bffa97f22996f59d7a3fcbdc2ebf2e43ac02bc067546f54e293e9b2f2514be145f867321e9031f895c063d9fb8
09fe346 Avoid -Wshadow warnings in wallet_tests (Russell Yanofsky)

Tree-SHA512: 03a026787438efc9eba94299c2dd7de07a71ec7363b058b4f086d5ff0be844660fff2ef4f40e43d91313ea53de25f3de3c677b080b564d37f0693057498d3233
f36bdf0 Enable host lookups for -proxy and -onion parameters (Johnathan Corgan)

Tree-SHA512: 40f5ef3954721333e58d34653874d9f6ac5426c817762d132838f3b6f968ca5ca05aa56d02fd742cb5a8dc040f1a28dad6d54f667342eceba62fb2af18b58fc0
e5b449c Docs: correct and elaborate -rpcbind doc (Ian Kelling)

Tree-SHA512: e1cdaa32f7248f304d463e3f37d7d5da23ee0e506bd453420b87f4cc9c704cc30214e41c9266294890d65f2ee270f9355f38b542e8c01452637bdbba8273c755
…he end

fa7da3f [contrib] gh-merge: Move second sha512 check to before signing (MarcoFalke)

Tree-SHA512: b3d96f928a013f6fdc416035b8ef5cd7c750ab0922156e1fd712cd27ec75847497109f43a96559b945ba11ad43b5644ed9c1de695590ff608658628fb57b1571
343ba8f [wallet] Remove redundant initialization (practicalswift)

Tree-SHA512: 54b94d7703b1735cb1ae0bd7eba61ca9d2f18e20b70e46c94aa3b0653495dce4fdea00cf953ec08215b96b5792eabb8b38c3f9b3cd36e52b82fcb2f1fd8a3540
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Feb 1, 2019
025dec0 [qa] assert_start_raises_init_error (NicolasDorier)

Tree-SHA512: 0fe3ecbd47625b181aed92f15445ac26993e1a8b9843bbc1088c4adcea774e503b870912a18e13dca3f255c22a9964c1c0ca92c758907538143f316c5272ea4a
f5aba8a Move tx version 2 standardness check to after bip68 activation (John Newbery)
99c0e81 Fix BIP68 activation test (John Newbery)

Tree-SHA512: 3633d5359705b33a22cd3d8ea28f41abd93ccc6fe9943c8004f6149add991771df9ea12b4e14192e39e14b414bb5ecc7218e516cfeec97e4c5df29778ac57060
db07f91 Assert that what might look like a possible division by zero is actually unreachable (practicalswift)

Tree-SHA512: f1652eb37196a5b72f356503a1fbb44fb98aa8a94954ad1765f86d81ebf41a2337d4eb58c4f19937fda3752f5d2d642756e44afdbd438015b87ac20801246bff
…rase of nonexistent "version" entry.

87ed396 [trivial] Add comment documenting bumpfee mapValues (Russell Yanofsky)
a1fe944 Remove reference to nonexistent "version" wallet transaction mapvalue field (Russell Yanofsky)
654e044 [trivial] Add comment documenting CWalletTx::mapValue (Russell Yanofsky)

Tree-SHA512: 1fd1860e345c59b13634db2007fff4ba30aaf1f177fdd765f47bf9257fac117cdcd5d491424416da304c08e85effbb27f3424f072f7c9587ef39cb98531b932a
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Feb 1, 2019
@PastaPastaPasta
Copy link
Member Author

PastaPastaPasta commented Feb 1, 2019

redid 9832, kept in redirect_stderr, missed a output bitcoin -> dash text change, but amended that in eadb780

PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Feb 1, 2019
@UdjinM6
Copy link

UdjinM6 commented Feb 1, 2019

Looks good in general (merge commits match corresponding PRs as far as I can tell) but you'll need this small fix UdjinM6@3a99b3f for rpc tests to pass. (EDIT: replaced diff with a link)

@PastaPastaPasta
Copy link
Member Author

Amended changes @UdjinM6 in 071035b

Copy link

@UdjinM6 UdjinM6 left a comment

Choose a reason for hiding this comment

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

utACK

(Travis failure seems to be unrelated, at least tests in a similar branch in my repo https://travis-ci.org/UdjinM6/dash/builds/487610642 are green)

@UdjinM6
Copy link

UdjinM6 commented Feb 4, 2019

@codablock ping :)

Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

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

utACK

@UdjinM6 UdjinM6 merged commit d343bfa into dashpay:develop Feb 4, 2019
@PastaPastaPasta PastaPastaPasta deleted the backports-0.15-pr5 branch March 11, 2019 04:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants