Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/instructions/reviewing.instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Use this to verify that the correct check macro is used and that the error path

## libcurl

CCF wraps libcurl in `src/http/curl.h`.
CCF wraps libcurl in `src/http_client/curl.h`.

| Macro | Use when … |
| -------------------------------------------- | ----------------------------------- |
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1599,7 +1599,7 @@ if(BUILD_TESTS)

add_test_bin(
curl_test
${CMAKE_CURRENT_SOURCE_DIR}/src/http/test/curl_test.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/http_client/test/curl_test.cpp
)
target_link_libraries(curl_test PRIVATE curl uv http_parser)

Expand Down
3 changes: 2 additions & 1 deletion scripts/source-dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
"tls": ["crypto", "ds"],
"udp": ["ds"],
"uv": [],
"http": ["ccf-api", "crypto", "ds", "uv"]
"http": ["ccf-api", "crypto", "ds"],
"http_client": ["ccf-api", "ds", "uv"]
}
}
2 changes: 1 addition & 1 deletion src/host/run.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "handle_ring_buffer.h"
#include "host/env.h"
#include "host/files_cleanup_timer.h"
#include "http/curl.h"
#include "http_client/curl.h"
#include "json_schema.h"
#include "lfs_file_handler.h"
#include "node_connections.h"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "ccf/ds/json.h"
#include "curl/curl.h"
#include "ds/internal_logger.h"
#include "http/curl.h"
#include "http_client/curl.h"

#include <cstdlib>
#include <curl/header.h>
Expand Down
2 changes: 1 addition & 1 deletion src/node/jwt_key_auto_refresh.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "ccf/ds/nonstd.h"
#include "ccf/service/tables/jwt.h"
#include "enclave/http_rpc_context.h"
#include "http/curl.h"
#include "http/http_builder.h"
#include "http_client/curl.h"
#include "node/rpc/node_frontend.h"
#include "tasks/basic_task.h"
#include "tasks/task_system.h"
Expand Down
2 changes: 1 addition & 1 deletion src/node/node_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
#include "enclave/rpc_sessions.h"
#include "encryptor.h"
#include "history.h"
#include "http/curl.h"
#include "http/http_parser.h"
#include "http_client/curl.h"
#include "indexing/indexer.h"
#include "js/global_class_ids.h"
#include "network_state.h"
Expand Down
2 changes: 1 addition & 1 deletion src/node/quote_endorsements_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "ccf/http_consts.h"
#include "ccf/pal/attestation.h"
#include "ccf/pal/attestation_sev_snp_endorsements.h"
#include "http/curl.h"
#include "http_client/curl.h"
#include "tasks/basic_task.h"
#include "tasks/task.h"
#include "tasks/task_system.h"
Expand Down
2 changes: 1 addition & 1 deletion src/node/recovery_decision_protocol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "ccf/service/tables/self_healing_open.h"
#include "ccf/tx.h"
#include "ccf/tx_id.h"
#include "http/curl.h"
#include "http_client/curl.h"
#include "node_state.h"
#include "tasks/basic_task.h"
#include "tasks/task_system.h"
Expand Down
2 changes: 1 addition & 1 deletion src/snapshots/fetch.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include "ccf/ds/nonstd.h"
#include "ccf/rest_verb.h"
#include "ds/internal_logger.h"
#include "http/curl.h"
#include "http/http_builder.h"
#include "http_client/curl.h"

#include <charconv>
#include <curl/curl.h>
Expand Down
Loading