From ca4f38dad9c8e3f5b60f22bd777bb75d55779b96 Mon Sep 17 00:00:00 2001
From: CJ Cobb <ccobb@ripple.com>
Date: Tue, 22 Dec 2020 17:44:17 -0500
Subject: [PATCH] clean up CMakeLists.txt and example config

---
 CMakeLists.txt | 77 +++++---------------------------------------------
 config.json    | 24 ----------------
 2 files changed, 7 insertions(+), 94 deletions(-)
 delete mode 100644 config.json

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 635c21b2..af74c560 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,80 +52,17 @@ message("${xrpl_core_includes}")
 INCLUDE_DIRECTORIES(${xrpl_core_includes})
 include(cassandra)
 include(Postgres)
-#include (FetchContent)
-#FetchContent_Declare(
-#  rippled
-#  GIT_REPOSITORY https://github.com/ripple/rippled.git
-#  GIT_TAG develop
-#)
-#FetchContent_MakeAvailable(rippled)
 
 
-#include(FetchContent)
-#
-#FetchContent_Declare(
-#  gRPC
-#  GIT_REPOSITORY https://github.com/grpc/grpc
-#  GIT_TAG        v1.28.0
-#  )
-#set(FETCHCONTENT_QUIET OFF)
-#FetchContent_MakeAvailable(gRPC)
-#
-#
-#
-#set(_PROTOBUF_LIBPROTOBUF libprotobuf)
-#set(_REFLECTION grpc++_reflection)
-#set(_PROTOBUF_PROTOC $<TARGET_FILE:protoc>)
-#set(_GRPC_GRPCPP grpc++)
-#set(_GRPC_CPP_PLUGIN_EXECUTABLE $<TARGET_FILE:grpc_cpp_plugin>)
-#message(${CMAKE_CURRENT_BINARY_DIR})
-#
-#set (GRPC_GEN_DIR "${CMAKE_BINARY_DIR}/proto_gen_grpc")
-#file (MAKE_DIRECTORY ${GRPC_GEN_DIR})
-#set (GRPC_PROTO_SRCS)
-#set (GRPC_PROTO_HDRS)
-#set (GRPC_PROTO_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/rippled/src/ripple/proto/org")
-#file(GLOB_RECURSE GRPC_DEFINITION_FILES LIST_DIRECTORIES false "${GRPC_PROTO_ROOT}/*.proto")
-#
-#foreach(file ${GRPC_DEFINITION_FILES})
-#  get_filename_component(_abs_file ${file} ABSOLUTE)
-#  get_filename_component(_abs_dir ${_abs_file} DIRECTORY)
-#  get_filename_component(_basename ${file} NAME_WE)
-#  get_filename_component(_proto_inc ${GRPC_PROTO_ROOT} DIRECTORY) # updir one level
-#  file(RELATIVE_PATH _rel_root_file ${_proto_inc} ${_abs_file})
-#  get_filename_component(_rel_root_dir ${_rel_root_file} DIRECTORY)
-#  file(RELATIVE_PATH _rel_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_abs_dir})
-#
-#  set (src_1 "${GRPC_GEN_DIR}/${_rel_root_dir}/${_basename}.grpc.pb.cc")
-#  set (src_2 "${GRPC_GEN_DIR}/${_rel_root_dir}/${_basename}.pb.cc")
-#  set (hdr_1 "${GRPC_GEN_DIR}/${_rel_root_dir}/${_basename}.grpc.pb.h")
-#  set (hdr_2 "${GRPC_GEN_DIR}/${_rel_root_dir}/${_basename}.pb.h")
-#
-#    add_custom_command(
-#          OUTPUT "${src_1}" "${src_2}" "${hdr_1}" "${hdr_2}"
-#          COMMAND ${_PROTOBUF_PROTOC}
-#    ARGS --grpc_out=${GRPC_GEN_DIR}
-#         --cpp_out=${GRPC_GEN_DIR}
-#            --plugin=protoc-gen-grpc="${_GRPC_CPP_PLUGIN_EXECUTABLE}"
-#         -I ${_proto_inc} -I ${_rel_dir}
-#         ${_abs_file}
-#          DEPENDS ${_abs_file}
-#    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
-#    set_source_files_properties(${src_1} ${src_2} ${hdr_1} ${hdr_2} PROPERTIES GENERATED TRUE)
-#    list(APPEND GRPC_PROTO_SRCS ${src_1} ${src_2})
-#    list(APPEND GRPC_PROTO_HDRS ${hdr_1} ${hdr_2})
-#endforeach()
-#
-#add_library (grpc_protobufs STATIC ${GRPC_PROTO_SRCS} ${GRPC_PROTO_HDRS})
-##target_include_directories (grpc_pbufs PRIVATE src)
-#target_include_directories (grpc_protobufs SYSTEM PUBLIC ${GRPC_GEN_DIR})
-#target_link_libraries (grpc_protobufs ${_REFLECTION} ${_PROTOBUF_LIBPROTOBUF} ${_GRPC_GRPCPP})
-
-
-target_sources(reporting PRIVATE reporting/ETLSource.cpp reporting/ReportingBackend.cpp reporting/Pg.cpp reporting/DBHelpers.cpp reporting/ReportingETL.cpp handlers/AccountInfo.cpp)
+target_sources(reporting PRIVATE
+    reporting/ETLSource.cpp
+    reporting/ReportingBackend.cpp
+    reporting/Pg.cpp
+    reporting/DBHelpers.cpp
+    reporting/ReportingETL.cpp
+    handlers/AccountInfo.cpp)
 
 
 message(${Boost_LIBRARIES})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 TARGET_LINK_LIBRARIES(reporting PUBLIC ${Boost_LIBRARIES})
-#TARGET_LINK_LIBRARIES(reporting PUBLIC ${Boost_LIBRARIES})
diff --git a/config.json b/config.json
deleted file mode 100644
index e833e96f..00000000
--- a/config.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "database":
-    {
-        "cassandra":
-        {
-            "contact_points":"34.221.15.227",
-            "port":9042,
-            "keyspace":"xrpl_reporting",
-            "table_name":"cj",
-            "max_requests_outstanding":10000
-        },
-        "postgres": {
-            "conninfo":"postgres://postgres:coco@127.0.0.1/reporting"
-        }
-    },
-    "etl_sources":
-    [
-        {
-            "ip":"127.0.0.1",
-            "ws_port":"6005",
-            "grpc_port":"50051"
-        }
-    ]
-}