Skip to content

Backports 0.18 pr2#4219

Merged
PastaPastaPasta merged 7 commits into
dashpay:developfrom
Munkybooty:backports-0.18-pr2
Jun 30, 2021
Merged

Backports 0.18 pr2#4219
PastaPastaPasta merged 7 commits into
dashpay:developfrom
Munkybooty:backports-0.18-pr2

Conversation

@Munkybooty
Copy link
Copy Markdown

@Munkybooty Munkybooty commented Jun 28, 2021

No description provided.

@Munkybooty Munkybooty force-pushed the backports-0.18-pr2 branch 3 times, most recently from 36f6503 to 8904725 Compare June 28, 2021 23:20
@UdjinM6
Copy link
Copy Markdown

UdjinM6 commented Jun 29, 2021

13899 should be dropped (it was merged in #4196) + pls see b774f74 and 8aefd62

@UdjinM6 UdjinM6 added this to the 18 milestone Jun 29, 2021
@Munkybooty Munkybooty force-pushed the backports-0.18-pr2 branch from 8904725 to 8ac2649 Compare June 29, 2021 01:01
MarcoFalke and others added 4 commits June 28, 2021 21:05
@Munkybooty
Merge bitcoin#14287: tests: Use MakeUnique to construct objects owned…
afe42bd 
… by unique_ptrs

b6718e3 tests: Use MakeUnique to construct objects owned by unique_ptrs (practicalswift)

Pull request description:

  A subset of bitcoin#14211 ("Use MakeUnique to construct objects owned by unique_ptrs") as suggested by @MarcoFalke in bitcoin#14211 (comment).

  Use `MakeUnique` to construct objects owned by `unique_ptr`s.

  Rationale:
  * `MakeUnique` ensures exception safety in complex expressions.
  * `MakeUnique` gives a more concise statement of the construction.

Tree-SHA512: 1228ae6ce7beb178d79142c4e936b728178ccaa8aa35c6d8feeb33d1a667abfdd010c59996a9d833594611e913877ce5794e75953d11d9b1fdbac04aa491d9cf
@sipa @Munkybooty
Merge bitcoin#14460: tests: Improve 'CAmount' tests
b8a46a3 
29ed2d6 Improve CAmount tests (Hennadii Stepanov)

Pull request description:

  This provides:
    - more `MoneyRange` tests;
    - new `CFeeRate` constructor tests with zero byte size;
    - explicit using of the `CAmount` type.

Tree-SHA512: ca0ad6ccb37909a2a5c11034dc07b316a84c32fb40c6f8b6cfc28ebec72a1de157f31d22e767ae80d70ed06d7296f23870cc5ed0689f34a754ae763d50e23d43
@Munkybooty
Merge bitcoin#14504: show the progress of functional test
2e9da22 
example (added the progress index `n/m`)
```
1/107 - wallet_hd.py passed, Duration: 27 s
.........................................................................................
2/107 - mining_getblocktemplate_longpoll.py passed, Duration: 72 s
..................................................................
3/107 - feature_maxuploadtarget.py passed, Duration: 78 s
```

- clear dots line
```
$ test/functional/test_runner.py -t can_trash
Temporary test directory at can_trash/test_runner_₿_🏃_20181018_220600
1/105 - wallet_hd.py passed, Duration: 21 s
2/105 - mining_getblocktemplate_longpoll.py passed, Duration: 71 s
3/105 - feature_maxuploadtarget.py passed, Duration: 68 s
..................
```

- don't print the `dot` progressive if `--quiet`

- done_str
- nothing commit to check again travis tests
@Munkybooty
Merge bitcoin#14569: tests: Print dots by default in functional tests
a5f0708 
4bd125f tests: Print dots by default (Chun Kuan Lee)

Pull request description:

  In cron job (https://travis-ci.org/bitcoin/bitcoin/builds/445823485), the functional tests would fail due to silent for 10 mins.

  After applying this patch, we con't see any extra characters printed on screen but also avoid timeout (https://travis-ci.org/ken2812221/bitcoin/builds/445981698)

Tree-SHA512: c0412e171a451b27f9734311c7f063ad3fd7142087ed1e3786b4f303acaebc043f970523d6c2d4ef57ec5857040e2b6f7fd6345304353e7805d76044d317344d

# Conflicts:
#	test/functional/test_runner.py
@Munkybooty Munkybooty force-pushed the backports-0.18-pr2 branch from 8ac2649 to b5e608a Compare June 29, 2021 01:09
UdjinM6
UdjinM6 reviewed Jun 29, 2021
View reviewed changes
Copy link
Copy Markdown

@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.

still missing 8aefd62

MarcoFalke and others added 3 commits June 28, 2021 22:09
@Munkybooty
Merge bitcoin#13534: Don't assert(foo()) where foo() has side effects
92a4fb7 
6ad0328 Don't assert(foo()) where foo has side effects (practicalswift)

Pull request description:

  Don't `assert(foo())` where `foo` has side effects.

  From `assert(3)`:

  > If the macro `NDEBUG` is defined at the moment `<assert.h>` was last included, the macro `assert()` generates no code, and hence does nothing at all.

  Bitcoin currently cannot be compiled without assertions, but we shouldn't rely on that.

Tree-SHA512: 28cff0c6d1c2fb612ca58c9c94142ed01c5cfd0a2fecb8e59cdb6c270374b215d952ed3491d921d84dc1b439fa49da4f0e75e080f6adcbc6b0e08be14e54c170

# Conflicts:
#	src/bench/block_assemble.cpp
#	src/bench/checkblock.cpp
#	src/script/sign.cpp
@Munkybooty
Merge bitcoin#13634: ui: Compile boost::signals2 only once
3d05f2a 
fa5ce27 ui: Compile boost:signals2 only once (MarcoFalke)

Pull request description:

  ui is one of the modules that poison other modules with `boost/signals2` headers. This moves the include to the cpp file and uses a forward declaration in the header.

  Locally this speeds up the incremental build (building everything that uses the ui module) with gcc by ~5% for me. Gcc uses ~5% less memory.

  Would be nice if someone could verify the numbers roughly.

  I presume the improvements will be more pronounced if the other models would stop exposing the boost header as well.

Tree-SHA512: 078360eba330ddbca4268bd8552927eae242a239e18dfded25ec20be72650a68cd83af7ac160690249b943d33ae35d15df1313f1f60a0c28b9526853aa7d1e40

# Conflicts:
#	src/interfaces/node.cpp
#	src/noui.cpp
#	src/ui_interface.h
@laanwj @Munkybooty
Merge bitcoin#13961: util: Replace boost::signals2 with std::function
e86ea61 
ddddce0 util: Replace boost::signals2 with std::function (MarcoFalke)

Pull request description:

  This removes the `#include <boost/signals2/signal.hpp>` from `util.h` (hopefully speeding up the build time and reducing the memory usage further after  bitcoin#13634)

  The whole translation interface is replaced by a function `G_TRANSLATION_FUN` that is set to nullptr in units that don't need translation. (Thus only set in the gui)

Tree-SHA512: 087c717358bbed8bdb409463e225239d667f1ced381abb10e7cd31a41dcdd2cebe20b43c2ee86f0f8e55d53301f75e963f07421a99a7ff4c0cad2c6a375c5ab1

# Conflicts:
#	src/bench/bench_dash.cpp
#	src/qt/dash.cpp
#	src/qt/splashscreen.cpp
#	src/qt/transactiontablemodel.cpp
#	src/test/test_dash.cpp
#	src/util/system.h
#	src/wallet/coinselection.cpp
@Munkybooty Munkybooty force-pushed the backports-0.18-pr2 branch from b9dfde0 to e86ea61 Compare June 29, 2021 02:10
@Munkybooty Munkybooty requested a review from UdjinM6 June 29, 2021 02:22
UdjinM6
UdjinM6 approved these changes Jun 29, 2021
View reviewed changes
Copy link
Copy Markdown

@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

PastaPastaPasta
PastaPastaPasta approved these changes Jun 30, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

utACK

@PastaPastaPasta PastaPastaPasta merged commit 2a371a1 into dashpay:develop Jun 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@UdjinM6 UdjinM6 UdjinM6 approved these changes

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

18

Development

Successfully merging this pull request may close these issues.

5 participants

@Munkybooty @UdjinM6 @PastaPastaPasta @sipa @laanwj