diff --git a/crates/CMakeLists.txt b/crates/CMakeLists.txt index d568b9c9a9..a728b47cc5 100644 --- a/crates/CMakeLists.txt +++ b/crates/CMakeLists.txt @@ -101,8 +101,6 @@ function(add_xrpl_crate name) add_dependencies(xrpl_crates ${name}_cxxbridge) endfunction() -add_xrpl_crate(rs_hello_world CRATE rs_hello_world FILES lib.rs) - add_xrpl_crate(xrpl_wasm_vm_ffi CRATE xrpl_wasm_vm_ffi FILES lib.rs) # Test-only, and deliberately not part of xrpl_wasm_vm_ffi: it carries the `wat` assembler, diff --git a/crates/Cargo.lock b/crates/Cargo.lock index 58c47bd3c0..53f6aad57c 100644 --- a/crates/Cargo.lock +++ b/crates/Cargo.lock @@ -223,13 +223,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rs-hello_world" -version = "0.1.0" -dependencies = [ - "cxx", -] - [[package]] name = "scratch" version = "1.0.9" diff --git a/crates/Cargo.toml b/crates/Cargo.toml index f1cbd3bec5..d08f4da233 100644 --- a/crates/Cargo.toml +++ b/crates/Cargo.toml @@ -1,6 +1,5 @@ [workspace] members = [ - "hello_world", "xrpl-wasm-vm-ffi", "xrpl-wasm-vm", "xrpl-wasm-testkit", diff --git a/crates/hello_world/Cargo.toml b/crates/hello_world/Cargo.toml deleted file mode 100644 index 2e5a329c9a..0000000000 --- a/crates/hello_world/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "rs-hello_world" -version = "0.1.0" -edition.workspace = true - -[lib] -crate-type = ["staticlib"] - -[dependencies] -cxx.workspace = true diff --git a/crates/hello_world/src/lib.rs b/crates/hello_world/src/lib.rs deleted file mode 100644 index b1cb121fa0..0000000000 --- a/crates/hello_world/src/lib.rs +++ /dev/null @@ -1,10 +0,0 @@ -#[cxx::bridge(namespace = "rs::hello_world")] -mod ffi { - extern "Rust" { - fn hello_world() -> String; - } -} - -pub fn hello_world() -> String { - "hello_world".to_string() -} diff --git a/src/tests/libxrpl/CMakeLists.txt b/src/tests/libxrpl/CMakeLists.txt index e2285ff672..44f7b4bdc4 100644 --- a/src/tests/libxrpl/CMakeLists.txt +++ b/src/tests/libxrpl/CMakeLists.txt @@ -23,10 +23,7 @@ set_target_properties( target_include_directories(xrpl_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) target_link_libraries(xrpl_tests PRIVATE GTest::gtest GTest::gmock xrpl.libxrpl) -# Lets the wasm tests write their modules as WebAssembly text. Test-only by construction: -# the assembler lives in a crate nothing in libxrpl or xrpld links (see crates/CMakeLists). target_link_libraries(xrpl_tests PRIVATE xrpl_wasm_testkit_cxxbridge) -target_link_libraries(xrpl_tests PRIVATE rs_hello_world_cxxbridge) add_dependencies(xrpl_tests xrpl_crates) # One source subdirectory per module. Network unit tests are currently not diff --git a/src/tests/libxrpl/basics/RustInterop.cpp b/src/tests/libxrpl/basics/RustInterop.cpp deleted file mode 100644 index 8a6ad8a4ed..0000000000 --- a/src/tests/libxrpl/basics/RustInterop.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include - -#include - -TEST(RustInteropTest, hello_world) -{ - EXPECT_EQ(std::string(rs::hello_world::hello_world()), "hello_world"); -}