PastaPastaPasta
|
07dcddb4ca
|
Backports 0.15 pr2 (#2597)
* Merge #9815: Trivial: use EXIT_ codes instead of magic numbers
a87d02a use EXIT_ codes instead of magic numbers (Marko Bencun)
* Merge #9801: Removed redundant parameter from mempool.PrioritiseTransaction
eaea2bb Removed redundant parameter from mempool.PrioritiseTransaction (gubatron)
* remove extra parameter (see 3a3745bb) in dash specific code
* Merge #9819: Remove harmless read of unusued priority estimates
bc8fd12 Remove harmless read of unusued priority estimates (Alex Morcos)
* Merge #9766: Add --exclude option to rpc-tests.py
c578408 Add exclude option to rpc-tests.py (John Newbery)
* Merge #9577: Fix docstrings in qa tests
3f95a80 Fix docstrings in qa tests (John Newbery)
* Merge #9823: qa: Set correct path for binaries in rpc tests
3333ad0 qa: Set correct path for binaries in rpc tests (MarcoFalke)
* Merge #9833: Trivial: fix comments referencing AppInit2
ef9f495 Trivial: fix comments referencing AppInit2 (Marko Bencun)
* Merge #9612: [trivial] Rephrase the definition of difficulty.
dc222f8 Trivial: Rephrase the definition of difficulty in the code. (Karl-Johan Alm)
* Merge #9847: Extra test vector for BIP32
30aedcb BIP32 extra test vector (Pieter Wuille)
* Merge #9839: [qa] Make import-rescan.py watchonly check reliable
864890a [qa] Make import-rescan.py watchonly check reliable (Russell Yanofsky)
Tree-SHA512: ea0e2b1d4fc8f35174c3d575fb751b428daf6ad3aa944fad4e3ddcc9195e4f17051473acabc54203b1d27cca64cf911b737ab92e986c40ef384410652e2dbea1
* Change back file params
|
2019-01-07 12:55:35 +03:00 |
|
MarcoFalke
|
df24dfd4bc
|
Merge #9233: Fix some typos
15fa95d Fix some typos (fsb4000)
|
2018-01-17 17:27:24 +01:00 |
|
Wladimir J. van der Laan
|
942fe0ed49
|
Merge #8840: test: Explicitly set encoding to utf8 when opening text files
30930e8 test: Explicitly set encoding to utf8 when opening text files (Wladimir J. van der Laan)
|
2018-01-12 09:56:53 +01:00 |
|
MarcoFalke
|
bcecdcd8e9
|
Merge #8056: [qa] Remove hardcoded "4 nodes" from test_framework
fad68f7 [qa] Reduce node count for some tests (MarcoFalke)
fac9349 [qa] Remove hardcoded "4 nodes" from test_framework (MarcoFalke)
|
2017-12-21 18:50:13 +01:00 |
|
Wladimir J. van der Laan
|
25147c9dc7
|
Merge #7814: [qa] Switch to py3
fa389d4 [qa] Switch to py3 (MarcoFalke)
|
2017-12-21 17:31:54 +01:00 |
|
UdjinM6
|
6af7a58d92
|
Merge remote-tracking branch 'bitcoin/0.12' into mergebtc12, fix/dashify
NOTE: .travis.yml was mostly preserved, probably needs additional attention
|
2016-08-26 04:09:20 +03:00 |
|
Holger Schinzel
|
f4e4dd65e7
|
Tag 0.12.1 final
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQEbBAABCgAGBQJXD/i3AAoJEHSBCwEjRsmmOHsH+L5eRpiPeLhrDYyBFbp9RFKU
TztyoeKAM4llEPmk6vAawgSL8HNY4va6lbY84sDfvCdLJqCxVR7MyiuQ4AQPXG4R
Ke5DJ/G/K4ngyqruCBsSh2RJdVDrbE3zCmjN5gxPxrNKpi+mXs//A6gjvfxn4U1F
WZepN3FzNFcqFG/ndKxptMYZoIuiK9JIhK7V/ksFKRPlUhipa1jh5sIWvCeFjiLT
Wt8wGlHPHDFsPJW1o7EWMTHRhNCVqYhMDU7GT6FixIJFRGANIGlwfIUuqqUt0sil
7YWIwD/+ai3dfeODazauqJAOEBXjoWCkuXn9IN/VhtvHOFR6AZO2aljS9ks6Cw==
=6vRi
-----END PGP SIGNATURE-----
Merge bitcoin tag 'v0.12.1' into dash v0.12.1.x
Merging Bitcoin 0.12.1 into Dash 0.12.1.x
|
2016-07-04 11:20:16 +02:00 |
|
MarcoFalke
|
f1f1b82033
|
[qa] py2: Unfiddle strings into bytes explicitly
Github-Pull: #7853
Rebased-From: faa41ee204, fa7abe0a00
Conflicts:
qa/rpc-tests/invalidtxrequest.py
qa/rpc-tests/p2p-feefilter.py
qa/rpc-tests/proxy_test.py
qa/rpc-tests/test_framework/mininode.py
qa/rpc-tests/test_framework/netutil.py
src/test/bctest.py
|
2016-04-15 09:55:12 +02:00 |
|
MarcoFalke
|
f04f4fd2ee
|
[doc/log] Fix markdown syntax and line terminate LogPrint
- Fix doxygen comment for payTxFee
- [doc] Fix markdown
- Make sure LogPrintf strings are line-terminated
Github-Pull: #7617
Rebased-From: fa06ce0949 fa97f95c15 fa26652459
|
2016-03-11 09:44:17 +01:00 |
|
UdjinM6
|
31ff9c2ff8
|
Fix rpc-tests, relies on PRs #715-#719
Closes #720
|
2016-03-06 18:16:02 +01:00 |
|
Gregory Sanders
|
d52fbf00e3
|
Added additional config option for multiple RPC users.
|
2015-11-29 08:34:20 -05:00 |
|