Skip to content

Commit a5dd0f3

Browse files
joemphilipsjoemphilips
committed
Revert "WIP: refactoring to use Option instead of Ref for fn pointer"
This reverts commit b7f4af81bb15fd436a512ea0716c7206335564bf.
1 parent d67ebb2 commit a5dd0f3

File tree

4 files changed

+30
-36
lines changed

4 files changed

+30
-36
lines changed

‎bindings/src/blocknotifier.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ ffi! {
1818

1919
fn create_block_notifier(
2020
network_ref: FFINetwork,
21-
log_ptr: Option<ffilogger_fn::LogExtern>,
22-
install_watch_tx_ptr: Option<chain_watch_interface_fn::InstallWatchTxPtr>,
23-
install_watch_outpoint_ptr: Option<chain_watch_interface_fn::InstallWatchOutpointPtr>,
24-
watch_all_txn_ptr: Option<chain_watch_interface_fn::WatchAllTxnPtr>,
25-
get_chain_utxo_ptr: Option<chain_watch_interface_fn::GetChainUtxoPtr>,
21+
log_ptr: Ref<ffilogger_fn::LogExtern>,
22+
install_watch_tx_ptr: Ref<chain_watch_interface_fn::InstallWatchTxPtr>,
23+
install_watch_outpoint_ptr: Ref<chain_watch_interface_fn::InstallWatchOutpointPtr>,
24+
watch_all_txn_ptr: Ref<chain_watch_interface_fn::WatchAllTxnPtr>,
25+
get_chain_utxo_ptr: Ref<chain_watch_interface_fn::GetChainUtxoPtr>,
2626
handle: Out<FFIBlockNotifierHandle>
2727
) -> FFIResult {
2828
let network = network_ref.to_network();

‎bindings/src/channelmanager.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,14 +137,14 @@ ffi! {
137137
network_ref: Ref<FFINetwork>,
138138
cfg: Ref<UserConfig>,
139139

140-
install_watch_tx_ptr: Option<chain_watch_interface_fn::InstallWatchTxPtr>,
141-
install_watch_outpoint_ptr: Option<chain_watch_interface_fn::InstallWatchOutpointPtr>,
142-
watch_all_txn_ptr: Option<chain_watch_interface_fn::WatchAllTxnPtr>,
143-
get_chain_utxo_ptr: Option<chain_watch_interface_fn::GetChainUtxoPtr>,
144-
145-
broadcast_transaction_ptr: Option<broadcaster_fn::BroadcastTransactionPtr>,
146-
log_ptr: Option<ffilogger_fn::LogExtern>,
147-
get_est_sat_per_1000_weight_ptr: Option<fee_estimator_fn::GetEstSatPer1000WeightPtr>,
140+
install_watch_tx_ptr: Ref<chain_watch_interface_fn::InstallWatchTxPtr>,
141+
install_watch_outpoint_ptr: Ref<chain_watch_interface_fn::InstallWatchOutpointPtr>,
142+
watch_all_txn_ptr: Ref<chain_watch_interface_fn::WatchAllTxnPtr>,
143+
get_chain_utxo_ptr: Ref<chain_watch_interface_fn::GetChainUtxoPtr>,
144+
145+
broadcast_transaction_ptr: Ref<broadcaster_fn::BroadcastTransactionPtr>,
146+
log_ptr: Ref<ffilogger_fn::LogExtern>,
147+
get_est_sat_per_1000_weight_ptr: Ref<fee_estimator_fn::GetEstSatPer1000WeightPtr>,
148148
cur_block_height: usize,
149149
chan_man: Out<FFIArcChannelManagerHandle>) -> FFIResult {
150150

‎bindings/src/is_null.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,5 @@ impl<T: ?Sized> IsNull for *mut T {
4343
}
4444
}
4545

46-
impl<T> IsNull for Option<T> {
47-
fn is_null(&self) -> bool {
48-
self.is_none()
49-
}
50-
}
51-
5246
never_null!(usize, isize, u8, u16, u32, u64, u128, i8, i16, i32, i64, i128, bool);
5347
never_null!(crate::adaptors::FFINetwork);

‎bindings/src/peermanager.rs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ lazy_static! {
3131

3232
fn construct_socket_desc (
3333
index: usize,
34-
send_data_ptr: Option<socket_descriptor_fn::SendData>,
35-
disconnect_socket_ptr: Option<socket_descriptor_fn::DisconnectSocket>,
34+
send_data_ptr: Ref<socket_descriptor_fn::SendData>,
35+
disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
3636
) -> FFISocketDescriptor {
3737
let send_data_ref = unsafe_block!("" => send_data_ptr.as_ref());
3838
let disconnect_socket_ref = unsafe_block!("" => disconnect_socket_ptr.as_ref());
@@ -48,11 +48,11 @@ ffi! {
4848
cfg: Ref<UserConfig>,
4949

5050
chan_man: FFIArcChannelManagerHandle,
51-
install_watch_tx_ptr: Option<chain_watch_interface_fn::InstallWatchTxPtr>,
52-
install_watch_outpoint_ptr: Option<chain_watch_interface_fn::InstallWatchOutpointPtr>,
53-
watch_all_txn_ptr: Option<chain_watch_interface_fn::WatchAllTxnPtr>,
54-
get_chain_utxo_ptr: Option<chain_watch_interface_fn::GetChainUtxoPtr>,
55-
log_ptr: Option<ffilogger_fn::LogExtern>,
51+
install_watch_tx_ptr: Ref<chain_watch_interface_fn::InstallWatchTxPtr>,
52+
install_watch_outpoint_ptr: Ref<chain_watch_interface_fn::InstallWatchOutpointPtr>,
53+
watch_all_txn_ptr: Ref<chain_watch_interface_fn::WatchAllTxnPtr>,
54+
get_chain_utxo_ptr: Ref<chain_watch_interface_fn::GetChainUtxoPtr>,
55+
log_ptr: Ref<ffilogger_fn::LogExtern>,
5656

5757
our_node_secret_ptr: Ref<Bytes32>,
5858
our_node_id_ptr: Ref<Bytes33>,
@@ -99,8 +99,8 @@ ffi! {
9999

100100
fn new_inbound_connection(
101101
index: usize,
102-
send_data_ptr: Option<socket_descriptor_fn::SendData>,
103-
disconnect_socket_ptr: Option<socket_descriptor_fn::DisconnectSocket>,
102+
send_data_ptr: Ref<socket_descriptor_fn::SendData>,
103+
disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
104104
handle: FFIArcPeerManagerHandle
105105
) -> FFIResult {
106106
let socket = construct_socket_desc(index, send_data_ptr, disconnect_socket_ptr);
@@ -111,8 +111,8 @@ ffi! {
111111

112112
fn new_outbound_connection(
113113
index: usize,
114-
send_data_ptr: Option<socket_descriptor_fn::SendData>,
115-
disconnect_socket_ptr: Option<socket_descriptor_fn::DisconnectSocket>,
114+
send_data_ptr: Ref<socket_descriptor_fn::SendData>,
115+
disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
116116
their_node_id: Ref<Bytes33>,
117117
handle: FFIArcPeerManagerHandle,
118118
initial_send: Out<[u8; 50]>
@@ -136,8 +136,8 @@ ffi! {
136136

137137
fn write_buffer_space_avail(
138138
index: usize,
139-
send_data_ptr: Optionf<socket_descriptor_fn::SendData>,
140-
disconnect_socket_ptr: Option<socket_descriptor_fn::DisconnectSocket>,
139+
send_data_ptr: Ref<socket_descriptor_fn::SendData>,
140+
disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
141141
handle: FFIArcPeerManagerHandle
142142
) -> FFIResult {
143143
let mut socket = construct_socket_desc(index, send_data_ptr, disconnect_socket_ptr);
@@ -148,8 +148,8 @@ ffi! {
148148

149149
fn read_event(
150150
index: usize,
151-
send_data_ptr: Option<socket_descriptor_fn::SendData>,
152-
disconnect_socket_ptr: Option<socket_descriptor_fn::DisconnectSocket>,
151+
send_data_ptr: Ref<socket_descriptor_fn::SendData>,
152+
disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
153153
data_ref: Ref<FFIBytes>,
154154
should_pause_read: Out<Bool>,
155155
handle: FFIArcPeerManagerHandle
@@ -170,8 +170,8 @@ ffi! {
170170

171171
fn socket_disconnected(
172172
index: usize,
173-
send_data_ptr: Option<socket_descriptor_fn::SendData>,
174-
disconnect_socket_ptr: Option<socket_descriptor_fn::DisconnectSocket>,
173+
send_data_ptr: Ref<socket_descriptor_fn::SendData>,
174+
disconnect_socket_ptr: Ref<socket_descriptor_fn::DisconnectSocket>,
175175
handle: FFIArcPeerManagerHandle) -> FFIResult {
176176
let mut socket = construct_socket_desc(index, send_data_ptr, disconnect_socket_ptr);
177177
let peer_man: &FFISimpleArcPeerManager = unsafe_block!("We know handle points to valid PeerManager" => handle.as_ref());

0 commit comments

Comments
 (0)