Actually disable BnB when there are preset inputs
ClosedPublic
Actions

Authored by deadalnix on Jun 21 2019, 02:03.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rSTAGING740a33e83f89: Actually disable BnB when there are preset inputs
rABC740a33e83f89: Actually disable BnB when there are preset inputs

Summary

We don't want to use BnB when there are preset inputs because there
is some weirdness with making that work with using the KnapsackSolver
as the fallback. Currently we say that we haven't used bnb when
there are preset inputs, but we don't actually disable BnB. This fixes
that.

Test that BnB is not used when there are preset inputs

This is a backport of Core PR12694

Depends on D3364

Test Plan

make check

Diff Detail

Repository

rABC Bitcoin ABC

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

deadalnix created this revision.Jun 21 2019, 02:03

Herald added a reviewer: Restricted Project. · View Herald TranscriptJun 21 2019, 02:03

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6422: Diff 9560.Jun 21 2019, 02:14

markblundeberg added a subscriber: markblundeberg.Jun 21 2019, 13:54

markblundeberg added inline comments.

src/wallet/test/coinselector_tests.cpp
34 ↗	(On Diff #9560)	Hmm the original PR has a global `static CWallet testWallet` here... did we out-of-order backport something, and if so, could there be something missing?
src/wallet/wallet.h
789 ↗	(On Diff #9560)	note -- Core code uses pass-by-reference for nTargetValue, for some odd reason. Doesn't really matter here I guess.

deadalnix added a child revision: D3387: Speedup coinselector_tests by using a dummy WalletDBWrapper when apropriate.Jun 22 2019, 01:24

deadalnix added inline comments.Jun 22 2019, 21:03

src/wallet/test/coinselector_tests.cpp
34 ↗	(On Diff #9560)	No but unnecessary globals sucks.
src/wallet/wallet.h
789 ↗	(On Diff #9560)	They pass amount by ref which makes no sense as the copy is trivial and the damn thing is pointer sized.