Skip to content

Commit 5267841

Browse files
committed
chore: narrow barretenberg API headers
1 parent d84ed7d commit 5267841

6 files changed

Lines changed: 40 additions & 28 deletions

File tree

barretenberg/cpp/src/barretenberg/api/api_chonk.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "barretenberg/api/file_io.hpp"
33
#include "barretenberg/api/json_output.hpp"
44
#include "barretenberg/api/log.hpp"
5-
#include "barretenberg/bbapi/bbapi.hpp"
5+
#include "barretenberg/bbapi/bbapi_chonk.hpp"
66
#include "barretenberg/chonk/chonk.hpp"
77
#include "barretenberg/chonk/chonk_verifier.hpp"
88
#include "barretenberg/chonk/mock_circuit_producer.hpp"

barretenberg/cpp/src/barretenberg/api/api_msgpack.hpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
#include <memory>
66
#include <string>
77

8+
namespace bb {
9+
810
#ifndef __wasm__
9-
#include "barretenberg/ipc/ipc_server.hpp"
11+
namespace ipc {
12+
class IpcServer;
13+
}
1014
#endif
1115

12-
namespace bb {
13-
1416
/**
1517
* @brief Process msgpack API commands from an input stream
1618
*

barretenberg/cpp/src/barretenberg/bb/cli.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,15 @@
2323
#include "barretenberg/api/file_io.hpp"
2424
#include "barretenberg/bb/cli11_formatter.hpp"
2525
#include "barretenberg/bb/curve_constants.hpp"
26-
#include "barretenberg/bbapi/bbapi.hpp"
27-
#include "barretenberg/bbapi/bbapi_ultra_honk.hpp"
28-
#include "barretenberg/bbapi/c_bind.hpp"
26+
#include "barretenberg/bbapi/bbapi_schema.hpp"
2927
#include "barretenberg/common/assert.hpp"
3028
#include "barretenberg/common/bb_bench.hpp"
3129
#include "barretenberg/common/get_bytecode.hpp"
3230
#include "barretenberg/common/memory_profile.hpp"
3331
#include "barretenberg/common/thread.hpp"
3432
#include "barretenberg/common/version.hpp"
3533
#include "barretenberg/dsl/acir_format/serde/index.hpp"
34+
#include "barretenberg/polynomials/backing_memory.hpp"
3635
#include "barretenberg/srs/factories/native_crs_factory.hpp"
3736
#include "barretenberg/srs/global_crs.hpp"
3837
#include "barretenberg/vm2/api_avm.hpp"

barretenberg/cpp/src/barretenberg/bbapi/bbapi_execute.cpp

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,27 @@
11
#include "bbapi_execute.hpp"
2+
#include <type_traits>
3+
#include <utility>
24

35
namespace bb::bbapi {
6+
7+
CommandResponse execute(BBApiRequest& request, Command&& command)
8+
{
9+
// Reset error state before execution
10+
request.error_message.clear();
11+
12+
CommandResponse response = std::move(command).visit([&request](auto&& cmd) -> CommandResponse {
13+
using CmdType = std::decay_t<decltype(cmd)>;
14+
return std::forward<CmdType>(cmd).execute(request);
15+
});
16+
17+
// Check if an error occurred during execution
18+
if (!request.error_message.empty()) {
19+
return ErrorResponse{ .message = std::move(request.error_message) };
20+
}
21+
22+
return response;
23+
}
24+
425
namespace { // anonymous
526
struct Api {
627
Command commands;

barretenberg/cpp/src/barretenberg/bbapi/bbapi_execute.hpp

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include "barretenberg/bbapi/bbapi_ecc.hpp"
77
#include "barretenberg/bbapi/bbapi_ecdsa.hpp"
88
#include "barretenberg/bbapi/bbapi_schnorr.hpp"
9+
#include "barretenberg/bbapi/bbapi_schema.hpp"
910
#include "barretenberg/bbapi/bbapi_shared.hpp"
1011
#include "barretenberg/bbapi/bbapi_srs.hpp"
1112
#include "barretenberg/bbapi/bbapi_ultra_honk.hpp"
@@ -148,26 +149,6 @@ using CommandResponse = NamedUnion<ErrorResponse,
148149
* @param request The circuit registry (acting as the request context).
149150
* @return A variant of all possible command responses.
150151
*/
151-
inline CommandResponse execute(BBApiRequest& request, Command&& command)
152-
{
153-
// Reset error state before execution
154-
request.error_message.clear();
155-
156-
CommandResponse response = std::move(command).visit([&request](auto&& cmd) -> CommandResponse {
157-
using CmdType = std::decay_t<decltype(cmd)>;
158-
return std::forward<CmdType>(cmd).execute(request);
159-
});
160-
161-
// Check if an error occurred during execution
162-
if (!request.error_message.empty()) {
163-
return ErrorResponse{ .message = std::move(request.error_message) };
164-
}
165-
166-
return response;
167-
}
168-
169-
// The msgpack scheme is an ad-hoc format that allows for cbind/compiler.ts to
170-
// generate TypeScript bindings for the API.
171-
std::string get_msgpack_schema_as_json();
152+
CommandResponse execute(BBApiRequest& request, Command&& command);
172153

173154
} // namespace bb::bbapi
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#pragma once
2+
3+
#include <string>
4+
5+
namespace bb::bbapi {
6+
7+
std::string get_msgpack_schema_as_json();
8+
9+
} // namespace bb::bbapi

0 commit comments

Comments
 (0)