Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: delete C++ PK circuits #4219

Merged
merged 5 commits into from
Jan 25, 2024
Merged
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
18 changes: 0 additions & 18 deletions .vscode/c_cpp_properties.json

This file was deleted.

36 changes: 0 additions & 36 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,5 @@
"localRoot": "${workspaceFolder}",
"sourceMaps": true
},
///////////////////////////////////////
// C++/Circuits targets
///////////////////////////////////////
{
"name": "(lldb) Launch native - Circuits C++",
"type": "lldb",
"request": "launch",
"program": "${command:cmake.launchTargetPath}",
"args": [ "--gtest_filter=*" ],
"cwd": "${workspaceFolder}/circuits/cpp/build",
"internalConsoleOptions": "openOnSessionStart",
"console": "internalConsole"
},
{
"name": "(lldb) Launch in WASM - Circuits C++",
"type": "lldb",
"request": "launch",
"program": "~/.wasmtime/bin/wasmtime",
"args": [
"-g", // tell wasmtime to generate debug info
"--disable-cache", // necessary or wasmtime throws a error:
// thread 'main' panicked at 'called `Result::unwrap()` on an `Err` value: ()', crates/jit/src/debug.rs:147:58
// in: wasmtime_jit::debug::create_gdbjit_image
"--dir", // give wasmtime the parent dir as a sandbox
"..", // needs this to find srs
"${command:cmake.launchTargetPath}", // the test exe
"--",
"--gtest_filter=*", // filter tests
"--gtest_color=1" // color gtest output (off by default in wasm)
],
"cwd": "${workspaceFolder}/circuits/cpp/build-wasm",
"internalConsoleOptions": "openOnSessionStart",
"console": "internalConsole"
},
// End C++/Circuits targets
///////////////////////////////////////
]
}
19 changes: 1 addition & 18 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@
"**/.yalc": true,
"**/node_modules": true,
"**/.pnp.*": true,
"circuits/cpp/barretenberg/**": true,
"**/msgpack-c/**": true
},
"[terraform]": {
Expand All @@ -141,12 +140,6 @@
//
"clangd.path": "clangd-15",
//
// CMake
//
// Location of base CMakeLists file
"cmake.sourceDirectory": "${workspaceFolder}/circuits/cpp/",
"cmake.buildDirectory": "${workspaceFolder}/circuits/cpp/build",
//
// C/C++ (should be disabled)
//
// Make sure all C++ IntelliSense features are disabled
Expand All @@ -160,15 +153,5 @@
"C_Cpp.default.enableConfigurationSquiggles": false,
"C_Cpp.formatting": "disabled",
"C_Cpp.vcpkg.enabled": false,
"C_Cpp.default.includePath": ["cpp/barretenberg/cpp/src"],
//
// TestMate C++
//
// Ensures tests are run from the `build` directory
// which ensures SRS can be read
"testMate.cpp.test.workingDirectory": "${workspaceFolder}/circuits/cpp/build",
// Filter all binaries that are not tests
"testMate.cpp.test.executables": "${workspaceFolder}/circuits/cpp/build/bin/*{test,Test,TEST}*"
// End C++/Circuits settings
///////////////////////////////////////
"C_Cpp.default.includePath": ["barretenberg/cpp/src"],
}
2 changes: 1 addition & 1 deletion barretenberg/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ A default configuration for VS Code is provided by the file [`barretenberg.code-

### Integration tests with Aztec in Monorepo

CI will automatically run integration tests against Aztec. The tests in `circuits/cpp` folder use the embedded barretenberg, and can be used to integration test it.
CI will automatically run integration tests against Aztec. It is located in the `barretenberg` folder.

### Integration tests with Aztec in Barretenberg Standalone Repo

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <cstdint>

namespace bb {
// TODO(#731): Changing the explicit value of these enum elements breaks brittle and outdated tests in circuits/cpp.
enum class CircuitType : uint32_t { STANDARD = 0, ULTRA = 2, UNDEFINED = 3 };

template <typename T, typename... U>
Expand Down
6 changes: 0 additions & 6 deletions circuits/.gitignore

This file was deleted.

Loading
Loading