Merge 408c920381 into merged_master (Bitcoin PR #16400)

Browse source

This was a scary-looking refactor but basically what it does is move all the
local variables from AcceptToMemoryPoolWorker into a class Workspace, so
that the method can be broken down into multiple steps.

The only Elements change required (beyond obvious conflict resolution) was
to also move the local variable setPeginsSpent into the class, and to rename
it m_set_pegins_spent for consistency. There were also multiple loops over
transaction inputs and it was important to make sure all the Elements pegin
logic went into the right ones, to preserve the control flow. This was
annoying because of all the whitespace changes in the PR but not too hard.

...

This commit is contained in:

Andrew Poelstra 2020-11-09 21:20:26 +00:00

parent ca7b7f3810 408c920381

commit 74202bd35a

1 changed files with 564 additions and 409 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

973

src/validation.cpp

View file

File diff suppressed because it is too large Load diff