diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-12-02 18:17:25 -0800 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-12-02 18:25:40 -0800 |
| commit | 2efcfa5acfacb958973d9e8125e1d81f102e2dfd (patch) | |
| tree | 6d62e14d6bb07b072421a426d72d70ae9dae3d9f /src/rpc/net.cpp | |
| parent | c36229b0b2e9d4554053f5c9fc451ac29a493b1f (diff) | |
| parent | 76faa3cdfedbd3fc91be4ecfff77fc6dc18134fb (diff) | |
Merge #9260: Mrs Peacock in The Library with The Candlestick (killed main.{h,cpp})
76faa3c Rename the remaining main.{h,cpp} to validation.{h,cpp} (Matt Corallo)
e736772 Move network-msg-processing code out of main to its own file (Matt Corallo)
87c35f5 Remove orphan state wipe from UnloadBlockIndex. (Matt Corallo)
Diffstat (limited to 'src/rpc/net.cpp')
| -rw-r--r-- | src/rpc/net.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index f57ba76d3a..53c0f993dc 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -6,8 +6,9 @@ #include "chainparams.h" #include "clientversion.h" -#include "main.h" +#include "validation.h" #include "net.h" +#include "net_processing.h" #include "netbase.h" #include "protocol.h" #include "sync.h" |