diff --git a/cmake/XrplCore.cmake b/cmake/XrplCore.cmake index 54b649c57c..b470e47dfa 100644 --- a/cmake/XrplCore.cmake +++ b/cmake/XrplCore.cmake @@ -151,13 +151,18 @@ target_link_libraries(xrpl.libxrpl.overlay PUBLIC xrpl.libxrpl.rdb ) +add_module(xrpl conditions) +target_link_libraries(xrpl.libxrpl.conditions PUBLIC + xrpl.libxrpl.overlay +) + add_module(xrpl ledger) target_link_libraries(xrpl.libxrpl.ledger PUBLIC xrpl.libxrpl.basics xrpl.libxrpl.json xrpl.libxrpl.protocol xrpl.libxrpl.rdb - xrpl.libxrpl.overlay + xrpl.libxrpl.conditions ) add_library(xrpl.libxrpl) diff --git a/cmake/XrplInstall.cmake b/cmake/XrplInstall.cmake index 83180614f3..1b0918b536 100644 --- a/cmake/XrplInstall.cmake +++ b/cmake/XrplInstall.cmake @@ -21,9 +21,10 @@ install ( xrpl.libxrpl.json xrpl.libxrpl.rdb xrpl.libxrpl.overlay - xrpl.libxrpl.ledger - xrpl.libxrpl.net xrpl.libxrpl.nodestore + xrpl.libxrpl.ledger + xrpl.libxrpl.conditions + xrpl.libxrpl.net xrpl.libxrpl.protocol xrpl.libxrpl.resource xrpl.libxrpl.server diff --git a/src/xrpld/conditions/Condition.h b/include/xrpl/conditions/Condition.h similarity index 98% rename from src/xrpld/conditions/Condition.h rename to include/xrpl/conditions/Condition.h index 52a6bcd9bb..a4dd6f589b 100644 --- a/src/xrpld/conditions/Condition.h +++ b/include/xrpl/conditions/Condition.h @@ -1,10 +1,9 @@ #ifndef XRPL_CONDITIONS_CONDITION_H #define XRPL_CONDITIONS_CONDITION_H -#include - #include #include +#include #include #include diff --git a/src/xrpld/conditions/Fulfillment.h b/include/xrpl/conditions/Fulfillment.h similarity index 98% rename from src/xrpld/conditions/Fulfillment.h rename to include/xrpl/conditions/Fulfillment.h index 970aed121c..1625b24eac 100644 --- a/src/xrpld/conditions/Fulfillment.h +++ b/include/xrpl/conditions/Fulfillment.h @@ -1,10 +1,9 @@ #ifndef XRPL_CONDITIONS_FULFILLMENT_H #define XRPL_CONDITIONS_FULFILLMENT_H -#include - #include #include +#include namespace xrpl { namespace cryptoconditions { diff --git a/src/xrpld/conditions/detail/PreimageSha256.h b/include/xrpl/conditions/detail/PreimageSha256.h similarity index 95% rename from src/xrpld/conditions/detail/PreimageSha256.h rename to include/xrpl/conditions/detail/PreimageSha256.h index 642a7afdc0..c0c61453aa 100644 --- a/src/xrpld/conditions/detail/PreimageSha256.h +++ b/include/xrpl/conditions/detail/PreimageSha256.h @@ -1,12 +1,11 @@ #ifndef XRPL_CONDITIONS_PREIMAGE_SHA256_H #define XRPL_CONDITIONS_PREIMAGE_SHA256_H -#include -#include -#include - #include #include +#include +#include +#include #include #include diff --git a/src/xrpld/conditions/detail/error.h b/include/xrpl/conditions/detail/error.h similarity index 100% rename from src/xrpld/conditions/detail/error.h rename to include/xrpl/conditions/detail/error.h diff --git a/src/xrpld/conditions/detail/utils.h b/include/xrpl/conditions/detail/utils.h similarity index 98% rename from src/xrpld/conditions/detail/utils.h rename to include/xrpl/conditions/detail/utils.h index b07b7b29e0..a19e5388db 100644 --- a/src/xrpld/conditions/detail/utils.h +++ b/include/xrpl/conditions/detail/utils.h @@ -1,10 +1,9 @@ #ifndef XRPL_CONDITIONS_UTILS_H #define XRPL_CONDITIONS_UTILS_H -#include - #include #include +#include #include diff --git a/src/xrpld/conditions/detail/Condition.cpp b/src/libxrpl/conditions/Condition.cpp similarity index 97% rename from src/xrpld/conditions/detail/Condition.cpp rename to src/libxrpl/conditions/Condition.cpp index ebf61dd245..d711c65c7c 100644 --- a/src/xrpld/conditions/detail/Condition.cpp +++ b/src/libxrpl/conditions/Condition.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include namespace xrpl { namespace cryptoconditions { diff --git a/src/xrpld/conditions/detail/Fulfillment.cpp b/src/libxrpl/conditions/Fulfillment.cpp similarity index 94% rename from src/xrpld/conditions/detail/Fulfillment.cpp rename to src/libxrpl/conditions/Fulfillment.cpp index 9ecaa44ab8..11581a8705 100644 --- a/src/xrpld/conditions/detail/Fulfillment.cpp +++ b/src/libxrpl/conditions/Fulfillment.cpp @@ -1,9 +1,8 @@ -#include -#include -#include -#include - #include +#include +#include +#include +#include namespace xrpl { namespace cryptoconditions { diff --git a/src/xrpld/conditions/detail/error.cpp b/src/libxrpl/conditions/error.cpp similarity index 98% rename from src/xrpld/conditions/detail/error.cpp rename to src/libxrpl/conditions/error.cpp index a74aa79e3f..8fb06a40f5 100644 --- a/src/xrpld/conditions/detail/error.cpp +++ b/src/libxrpl/conditions/error.cpp @@ -1,6 +1,5 @@ -#include - #include +#include #include diff --git a/src/test/conditions/PreimageSha256_test.cpp b/src/test/conditions/PreimageSha256_test.cpp index 71ba526be3..c3508758a7 100644 --- a/src/test/conditions/PreimageSha256_test.cpp +++ b/src/test/conditions/PreimageSha256_test.cpp @@ -1,12 +1,11 @@ -#include -#include -#include - #include #include #include #include #include +#include +#include +#include #include #include diff --git a/src/xrpld/app/tx/detail/Escrow.cpp b/src/xrpld/app/tx/detail/Escrow.cpp index 1f5b9e08a7..1d000d1be3 100644 --- a/src/xrpld/app/tx/detail/Escrow.cpp +++ b/src/xrpld/app/tx/detail/Escrow.cpp @@ -1,10 +1,10 @@ #include #include -#include -#include #include #include +#include +#include #include #include #include