| commit | ec20f01ba0945a3113797ac98a6b3500e24603d4 | |
| author | Pieter Wuille <pieter.wuille@gmail.com> | |
| Fri, 1 Sep 2017 22:44:05 +0000 (1 15:44 -0700) | ||
| committer | Pieter Wuille <pieter.wuille@gmail.com> | |
| Fri, 1 Sep 2017 22:51:49 +0000 (1 15:51 -0700) | ||
| tree | 8620fc258e14e88db9b3573fd06808d76d931fe4 | treesnapshot (tar.gz zip) |
| parent | 28f788e47e58f2b462351d6989348a4e1a241b2b | commitdiff |
| parent | 3918d93f3cd2305dc12cb964aebba0fc1f8720b4 | commitdiff |
Merge #11215: [tests] fixups from set_test_params()
3918d93f3 [tests] fixups from set_test_params() (John Newbery)
Pull request description:
#11121 had a silent merge conflict in `bitcoin_cli.py`. This fixes it.
Also fixes a comment in `example_test.py`
Tree-SHA512: f22a645c51c9aeda005526338ad6f2ee07f2bab172847fc54f51fecf1c79e778970be61e5e637d4e0aba3a02e5aba0737b0b57f1bc11a514a1acd94c221b54d6
3918d93f3 [tests] fixups from set_test_params() (John Newbery)
Pull request description:
#11121 had a silent merge conflict in `bitcoin_cli.py`. This fixes it.
Also fixes a comment in `example_test.py`
Tree-SHA512: f22a645c51c9aeda005526338ad6f2ee07f2bab172847fc54f51fecf1c79e778970be61e5e637d4e0aba3a02e5aba0737b0b57f1bc11a514a1acd94c221b54d6