diff options
| author | MarcoFalke <[email protected]> | 2020-03-01 15:33:52 -0500 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2020-03-01 15:34:05 -0500 |
| commit | 54a7ef612a3b69984d521432f8a694a682c76090 (patch) | |
| tree | 13004adb153060fe957b54a0f18f3e03c2228a00 /src/validationinterface.cpp | |
| parent | Merge #18229: random: drop unused MACH time headers (diff) | |
| parent | Templatize ValidationState instead of subclassing (diff) | |
| download | discoin-54a7ef612a3b69984d521432f8a694a682c76090.tar.xz discoin-54a7ef612a3b69984d521432f8a694a682c76090.zip | |
Merge #17399: validation: Templatize ValidationState instead of subclassing
10efc0487c442bccb0e4a9ac29452af1592a3cf2 Templatize ValidationState instead of subclassing (Jeffrey Czyz)
10e85d4adc9b7dbbda63e00195e0a962f51e4d2c Remove ValidationState's constructor (Jeffrey Czyz)
0aed17ef2892478c28cd660e53223c6dd1dc0187 Refactor FormatStateMessage into ValidationState (Jeffrey Czyz)
Pull request description:
This removes boilerplate code in the subclasses which otherwise only
differ by the result type.
The subclassing was introduced in a27a295.
ACKs for top commit:
MarcoFalke:
ACK 10efc0487c442bccb0e4a9ac29452af1592a3cf2 🐱
ajtowns:
ACK 10efc0487c442bccb0e4a9ac29452af1592a3cf2 -- looks good to me
jonatack:
ACK 10efc048 code review, build/tests green, nice cleanup
Tree-SHA512: 765dd52dde7d49b9a5c6d99d97c96f4492673e2aed0b0604faa88db0308fa4500a26bf755cca0b896be283874096c215932e1110a2d01dc012cd36a5fce58a42
Diffstat (limited to 'src/validationinterface.cpp')
| -rw-r--r-- | src/validationinterface.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/validationinterface.cpp b/src/validationinterface.cpp index 0f513c065..1deb93c97 100644 --- a/src/validationinterface.cpp +++ b/src/validationinterface.cpp @@ -11,7 +11,6 @@ #include <primitives/block.h> #include <primitives/transaction.h> #include <scheduler.h> -#include <util/validation.h> #include <future> #include <unordered_map> @@ -193,7 +192,7 @@ void CMainSignals::ChainStateFlushed(const CBlockLocator &locator) { void CMainSignals::BlockChecked(const CBlock& block, const BlockValidationState& state) { LOG_EVENT("%s: block hash=%s state=%s", __func__, - block.GetHash().ToString(), FormatStateMessage(state)); + block.GetHash().ToString(), state.ToString()); m_internals->BlockChecked(block, state); } |