diff options
| author | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-01-16 13:44:05 +0100 |
|---|---|---|
| committer | MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> | 2023-01-16 13:44:56 +0100 |
| commit | 6b7ccb98a59fa6f702b6dda007f003cffee19009 (patch) | |
| tree | f9338042be1ce2aa512a9686e041586c2d91d1ed /src/rpc | |
| parent | 2182149dc58fda0750ad92eba9e653a01000a51b (diff) | |
| parent | 282019cd3ddb060db350654e6f855f7ea37e0d34 (diff) | |
Merge bitcoin/bitcoin#26251: refactor: add kernel/cs_main.h
282019cd3ddb060db350654e6f855f7ea37e0d34 refactor: add kernel/cs_main.* (fanquake)
Pull request description:
One place to find / include `cs_main`.
No more:
> // Actually declared in validation.cpp; can't include because of circular dependency.
> extern RecursiveMutex cs_main;
Ultimately, no more need to include `validation.h` (which also includes (heavy/boost filled) `txmempool.h`) everywhere for `cs_main`. See #26087 for another example of why that is useful.
ACKs for top commit:
ajtowns:
ACK 282019cd3ddb060db350654e6f855f7ea37e0d34
Tree-SHA512: 142835b794873e7a09c3246d6101843ae81ec0c6295e6873130c98a2abfa5f7282748d0f1a37237a779cc71c3bc0a75d03b20313ef5398c83d4814215cbc8287
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/blockchain.h | 2 | ||||
| -rw-r--r-- | src/rpc/node.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/rpc/blockchain.h b/src/rpc/blockchain.h index 2a802f7fee..9ccb87b78a 100644 --- a/src/rpc/blockchain.h +++ b/src/rpc/blockchain.h @@ -16,8 +16,6 @@ #include <stdint.h> #include <vector> -extern RecursiveMutex cs_main; - class CBlock; class CBlockIndex; class Chainstate; diff --git a/src/rpc/node.cpp b/src/rpc/node.cpp index d8f2576b6d..ab1bc6615f 100644 --- a/src/rpc/node.cpp +++ b/src/rpc/node.cpp @@ -12,6 +12,7 @@ #include <interfaces/echo.h> #include <interfaces/init.h> #include <interfaces/ipc.h> +#include <kernel/cs_main.h> #include <node/context.h> #include <rpc/server.h> #include <rpc/server_util.h> |