Skip to content

Commit 7924771

Browse files
committed
fix node secret access in test
1 parent 99f24ab commit 7924771

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ public class HumanObjectPeerTestInstance {
195195
self.channelManager = ChannelManager(fee_est: self.feeEstimator, chain_monitor: self.chainWatch!, tx_broadcaster: self.txBroadcaster, logger: self.logger, keys_manager: self.keysInterface, config: UserConfig(), params: chainParameters)
196196
let randomData = self.keysInterface.get_secure_random_bytes()
197197
let messageHandler = MessageHandler(chan_handler_arg: self.channelManager.as_ChannelMessageHandler(), route_handler_arg: self.router.as_RoutingMessageHandler())
198-
self.peerManager = PeerManager(message_handler: messageHandler, our_node_secret: self.keysInterface.get_node_secret(), ephemeral_random_data: randomData, logger: self.logger, custom_message_handler: IgnoringMessageHandler().as_CustomMessageHandler())
198+
let nodeSecret = self.keysInterface.get_node_secret(recipient: LDKRecipient_Node).getValue()!
199+
self.peerManager = PeerManager(message_handler: messageHandler, our_node_secret: nodeSecret, ephemeral_random_data: randomData, logger: self.logger, custom_message_handler: IgnoringMessageHandler().as_CustomMessageHandler())
199200
}
200201
self.nodeId = self.channelManager.get_our_node_id()
201202
self.bindSocketHandler()

xcode/compile_dependency_binaries.sh

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,30 @@ python3 ../ci/fix_header_includes.py $DIRECT_BINDINGS_PROJECT_DIRECTORY
3333
pushd $C_BINDINGS_SOURCE_DIRECTORY
3434
#export RUSTFLAGS=""
3535
#export RUSTFLAGS="-Z sanitizer=address"
36+
#export RUSTFLAGS="--cfg=c_bindings --cfg=feature=\"std\" --cfg=feature=\"bitcoin/std\" --cfg=feature=\"lightning/std\" --cfg=feature=\"lightning-invoice/std\""
3637
export RUSTFLAGS="--cfg=c_bindings"
38+
#export RUSTFLAGS="--cfg=c_bindings --cfg=feature=\"default\" --cfg=feature=\"std\""
39+
#export RUSTFLAGS="--cfg=c_bindings --cfg=feature=\"default\""
3740
#export RUSTFLAGS="--cfg=c_bindings -C lto=off -C embed-bitcode=no"
3841
#export RUSTFLAGS="--cfg=c_bindings -C lto=off -Z embed-bitcode"
3942

43+
# sanity check
44+
#cargo rustc -- --print cfg
45+
#cargo build --target x86_64-apple-ios-macabi --release
46+
#exit
47+
48+
# Mac ABI binary
4049
rustup override set nightly
4150
cargo clean
42-
cargo build -Z build-std=panic_abort,std --target x86_64-apple-ios-macabi --release
51+
cargo build -Z build-std=panic_abort,std --features "std" --target x86_64-apple-ios-macabi --release
4352
cp "${C_BINDINGS_SOURCE_DIRECTORY}/target/x86_64-apple-ios-macabi/release/libldk.a" $FRAMEWORK_PROJECT_DIRECTORY_MAC
4453

54+
# iOS & Simulator binaries
4555
rustup override unset
4656
cargo clean
47-
cargo lipo --release
57+
cargo lipo --features "std" --release
4858
cp "${C_BINDINGS_SOURCE_DIRECTORY}/target/universal/release/libldk.a" $FRAMEWORK_PROJECT_DIRECTORY_IOS
49-
cargo lipo
59+
cargo lipo --features "std"
5060
cp "${C_BINDINGS_SOURCE_DIRECTORY}/target/universal/debug/libldk.a" $DIRECT_BINDINGS_PROJECT_DIRECTORY
5161

5262

0 commit comments

Comments
 (0)