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.

Sign up for GitHub

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

refactor: drop usage of chainstate globals in Dash-specific code, merge bitcoin#21866 (goodbye to a global chainstate) #6078

Merged
merged 12 commits into from
Jun 27, 2024
Merged

refactor: drop usage of chainstate globals in Dash-specific code, merge bitcoin#21866 (goodbye to a global chainstate) #6078

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f6f7df3
rpc: don't use GetUTXOCoin in CDeterministicMN::ToJson()
kwvg Jun 26, 2024
6abf7f8
refactor: stop using `::Chain`{`state`}`Active()` in `GetUTXO*`
kwvg Jun 25, 2024
c48c0e7
refactor: stop using `::ChainstateActive()` in `GetBlockHash`
kwvg Jun 26, 2024
ed56dbd
refactor: don't use globals to access members we can directly access
kwvg Jun 24, 2024
a475f5f
refactor: drop usage of chainstate globals in coinjoin logic
kwvg Jun 24, 2024
21cc12c
refactor: drop usage of chainstate globals in governance logic
kwvg Jun 26, 2024
fa20718
refactor: drop usage of chainstate globals in asset locks logic
kwvg Jun 26, 2024
303c6bb
refactor: drop usage of chainstate globals in llmq logic
kwvg Jun 24, 2024
208b1c0
refactor: drop usage of chainstate globals in masternode logic
kwvg Jun 24, 2024
0f4184c
refactor: drop usage of chainstate globals in spork logic
kwvg Jun 26, 2024
e3687f7
test, bench: remove globals vCoins and testWallet from test and bench
kwvg Jun 26, 2024
0213fbe
merge bitcoin#21866: Farewell, global Chainstate!
kwvg Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions src/bench/coin_selection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,16 @@ static void CoinSelection(benchmark::Bench& bench)
}

typedef std::set<CInputCoin> CoinSet;
static NodeContext testNode;
static auto testChain = interfaces::MakeChain(testNode);
static CWallet testWallet(testChain.get(), /*coinjoin_loader=*/ nullptr, "", CreateDummyWalletDatabase());
std::vector<std::unique_ptr<CWalletTx>> wtxn;

// Copied from src/wallet/test/coinselector_tests.cpp
static void add_coin(const CAmount& nValue, int nInput, std::vector<OutputGroup>& set)
{
CMutableTransaction tx;
tx.vout.resize(nInput + 1);
tx.vout[nInput].nValue = nValue;
std::unique_ptr<CWalletTx> wtx = std::make_unique<CWalletTx>(&testWallet, MakeTransactionRef(std::move(tx)));
CInputCoin coin(MakeTransactionRef(tx), nInput);
set.emplace_back();
set.back().Insert(COutput(wtx.get(), nInput, 0, true, true, true).GetInputCoin(), 0, true, 0, 0, false);
wtxn.emplace_back(std::move(wtx));
set.back().Insert(coin, 0, true, 0, 0, false);
}
// Copied from src/wallet/test/coinselector_tests.cpp
static CAmount make_hard_case(int utxos, std::vector<OutputGroup>& utxo_pool)
Expand All @@ -93,7 +88,6 @@ static CAmount make_hard_case(int utxos, std::vector<OutputGroup>& utxo_pool)
static void BnBExhaustion(benchmark::Bench& bench)
{
// Setup
testWallet.SetupLegacyScriptPubKeyMan();
std::vector<OutputGroup> utxo_pool;
CoinSet selection;
CAmount value_ret = 0;
Expand Down
Loading