diff options
author | W. J. van der Laan <laanwj@protonmail.com> | 2021-05-10 14:35:28 +0200 |
---|---|---|
committer | W. J. van der Laan <laanwj@protonmail.com> | 2021-05-10 14:35:31 +0200 |
commit | c49d24664790ba3ea52d05dab20a3692bbf8e2d1 (patch) | |
tree | 9b0e8202df4c26ce6276af70e5a335c4bbaf23b0 /src | |
parent | f8176b768a1c1500ae64815960948eda415e9997 (diff) | |
parent | 71c824ed6cf70b39ca09e8b3962f452f69523af0 (diff) |
Merge bitcoin/bitcoin#21745: refactor: Add missing includes in pubkey.cpp/pubkey.h
71c824ed6cf70b39ca09e8b3962f452f69523af0 cleaned up and added missing "include" statements for pubkey.cpp and pubkey.h (William Bright)
Pull request description:
#### Problem:
Many symbols in the files were undefined and causing issues when I was working on building independent sections of the codebase. The hidden imports from the "secp256k1" library was a particular pain point.
The other standard and missing includes are following best practices and will help with refactoring, build process and others.
#### Changes:
Clean up and declared imports/include for `pubkey.cpp` and `pubkey.h`
ACKs for top commit:
jnewbery:
utACK 71c824ed6c
laanwj:
Code review ACK 71c824ed6cf70b39ca09e8b3962f452f69523af0
Tree-SHA512: bce605cfde24d8e3be82a596cabab7a8577fec0aef7c5e6f7a56603357046d8e8dea11ac8e3dbe79600550291be7784e35c7a55ebf40b46525b8949e4bedae96
Diffstat (limited to 'src')
-rw-r--r-- | src/pubkey.cpp | 7 | ||||
-rw-r--r-- | src/pubkey.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/pubkey.cpp b/src/pubkey.cpp index a89988cc90..334acb454e 100644 --- a/src/pubkey.cpp +++ b/src/pubkey.cpp @@ -5,9 +5,16 @@ #include <pubkey.h> +#include <hash.h> #include <secp256k1.h> +#include <secp256k1_extrakeys.h> #include <secp256k1_recovery.h> #include <secp256k1_schnorrsig.h> +#include <span.h> +#include <uint256.h> + +#include <algorithm> +#include <cassert> namespace { diff --git a/src/pubkey.h b/src/pubkey.h index b653c202fc..1af1187006 100644 --- a/src/pubkey.h +++ b/src/pubkey.h @@ -12,7 +12,7 @@ #include <span.h> #include <uint256.h> -#include <stdexcept> +#include <cstring> #include <vector> const unsigned int BIP32_EXTKEY_SIZE = 74; |