Skip to content

Map Features objects in bindings #795

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.

Sign up for GitHub

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

Merged
merged 16 commits into from
Feb 18, 2021
Merged

Map Features objects in bindings #795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
10c4578
[bindings] Drop some significantly-overly-verbose logging in gen
TheBlueMatt Oct 26, 2020
9e596e2
[bindings] Use resolved, not local ident in generic mangling
TheBlueMatt Feb 6, 2021
be74b36
Gen bindings with rustc --pretty=expanded instead of reading files
TheBlueMatt Feb 7, 2021
0dcc937
Update demo C++ bindings example for new bindings
TheBlueMatt Feb 7, 2021
dd1ca58
[bindings] Extract import resolution logic into a separate struct
TheBlueMatt Feb 8, 2021
494e0fd
[bindings] Track all declared types in ImportResolver construction
TheBlueMatt Feb 9, 2021
3bbecbe
[bindings] Use new ImportResolver during first AST pass
TheBlueMatt Feb 9, 2021
61f5e79
Drop a useless import and use `Self` in return values in Features
TheBlueMatt Feb 11, 2021
b49781e
[bindings] Allow resolution of private types in some cases
TheBlueMatt Feb 11, 2021
f3ce706
[bindings] Track structs impling traits, incl priv traits
TheBlueMatt Feb 11, 2021
842d2f6
[bindings] Resolve type aliases mapped as opaque types
TheBlueMatt Feb 11, 2021
a387bad
[bindings] Handle generic-ized impl blocks by concretizing them
TheBlueMatt Feb 11, 2021
cdbe833
[bindings] Drop manual implementations of Features conversion
TheBlueMatt Feb 11, 2021
6f5f27e
[bindings] Handle `impl Clone` like `impl ::core::clone::Clone`
TheBlueMatt Feb 11, 2021
0a9a7c5
[bindings] Silence c-bindings-gen compile warnings
TheBlueMatt Feb 11, 2021
954e66e
Update auto-generated bindings
TheBlueMatt Feb 18, 2021
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
3 changes: 3 additions & 0 deletions c-bindings-gen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@ edition = "2018"
syn = { version = "1", features = ["full", "extra-traits"] }
proc-macro2 = "1"

[profile.release]
debug = true

# We're not in the workspace as we're just a binary code generator:
[workspace]
763 changes: 363 additions & 400 deletions c-bindings-gen/src/main.rs
View file
Open in desktop

Large diffs are not rendered by default.

462 changes: 262 additions & 200 deletions c-bindings-gen/src/types.rs
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions genbindings.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -x
# Generate (and reasonably test) C bindings

# First build the latest c-bindings-gen binary
cd c-bindings-gen && cargo build && cd ..
cd c-bindings-gen && cargo build --release && cd ..

# Then wipe all the existing C bindings (because we're being run in the right directory)
# note that we keep the few manually-generated files first:
Expand All @@ -20,12 +20,15 @@ mv ./mod.rs lightning-c-bindings/src/c_types/
mv ./bitcoin lightning-c-bindings/src/

# Finally, run the c-bindings-gen binary, building fresh bindings.
SRC="$(pwd)/lightning/src"
OUT="$(pwd)/lightning-c-bindings/src"
OUT_TEMPL="$(pwd)/lightning-c-bindings/src/c_types/derived.rs"
OUT_F="$(pwd)/lightning-c-bindings/include/rust_types.h"
OUT_CPP="$(pwd)/lightning-c-bindings/include/lightningpp.hpp"
RUST_BACKTRACE=1 ./c-bindings-gen/target/debug/c-bindings-gen $SRC/ $OUT/ lightning $OUT_TEMPL $OUT_F $OUT_CPP

cd lightning
RUSTC_BOOTSTRAP=1 cargo rustc --profile=check -- -Zunstable-options --pretty=expanded |
RUST_BACKTRACE=1 ../c-bindings-gen/target/release/c-bindings-gen $OUT/ lightning $OUT_TEMPL $OUT_F $OUT_CPP
cd ..

# Now cd to lightning-c-bindings, build the generated bindings, and call cbindgen to build a C header file
PATH="$PATH:~/.cargo/bin"
Expand Down
5 changes: 3 additions & 2 deletions lightning-c-bindings/demo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,9 @@ int main() {
assert(channels2->datalen == 0);

LDK::RoutingMessageHandler net_msgs2 = NetGraphMsgHandler_as_RoutingMessageHandler(&net_graph2);
LDK::ChannelAnnouncement chan_ann = ChannelAnnouncement_read(LDKu8slice { .data = valid_node_announcement, .datalen = sizeof(valid_node_announcement) });
LDK::CResult_boolLightningErrorZ ann_res = net_msgs2->handle_channel_announcement(net_msgs2->this_arg, &chan_ann);
LDK::CResult_ChannelAnnouncementDecodeErrorZ chan_ann = ChannelAnnouncement_read(LDKu8slice { .data = valid_node_announcement, .datalen = sizeof(valid_node_announcement) });
assert(chan_ann->result_ok);
LDK::CResult_boolLightningErrorZ ann_res = net_msgs2->handle_channel_announcement(net_msgs2->this_arg, chan_ann->contents.result);
assert(ann_res->result_ok);

LDK::MessageHandler msg_handler2 = MessageHandler_new(ChannelManager_as_ChannelMessageHandler(&cm2), std::move(net_msgs2));
Expand Down
Loading