Fix tests to work with 0.0.14

Author: arik-so

ci/Dockerfile

@@ -45,4 +45,5 @@ ENV LLVM_CLANG_ASAN_PATH="/clang+llvm-11.0.0-x86_64-linux-gnu-ubuntu-20.04/lib/c
 ENV ASAN_SYMBOLIZER_PATH="/clang+llvm-11.0.0-x86_64-linux-gnu-ubuntu-20.04/bin/llvm-symbolizer"
 ENV PATH="/clang+llvm-11.0.0-x86_64-linux-gnu-ubuntu-20.04/bin:${PATH}"
 ENV RUST_BACKTRACE=1
+ENV RUSTFLAGS="--cfg=c_bindings"
 ENV SHELL=/bin/bash

ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift

@@ -123,11 +123,11 @@ public class HumanObjectPeerTestInstance {
         }
 
         fileprivate class TestPersister: Persist {
-            override func persist_new_channel(id: OutPoint, data: ChannelMonitor) -> Result_NoneChannelMonitorUpdateErrZ {
+            override func persist_new_channel(channel_id: OutPoint, data: ChannelMonitor, update_id: MonitorUpdateId) -> Result_NoneChannelMonitorUpdateErrZ {
                 return Result_NoneChannelMonitorUpdateErrZ.ok()
             }
 
-            override func update_persisted_channel(id: OutPoint, update: ChannelMonitorUpdate, data: ChannelMonitor) -> Result_NoneChannelMonitorUpdateErrZ {
+            override func update_persisted_channel(channel_id: OutPoint, update: ChannelMonitorUpdate, data: ChannelMonitor, update_id: MonitorUpdateId) -> Result_NoneChannelMonitorUpdateErrZ {
                 return Result_NoneChannelMonitorUpdateErrZ.ok()
             }
         }
@@ -180,8 +180,14 @@ public class HumanObjectPeerTestInstance {
             self.init(master: master, _dummy: (), seed: seed)
 
             if master.use_chan_manager_constructor {
-                self.constructor = ChannelManagerConstructor(network: LDKNetwork_Bitcoin, config: UserConfig(), current_blockchain_tip_hash: [UInt8](repeating: 0, count: 32), current_blockchain_tip_height: 0, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor!, router: self.router, tx_broadcaster: self.txBroadcaster, logger: self.logger)
-                self.constructor?.chain_sync_completed(persister: TestChannelManagerPersister(master: self))
+
+                let graph = NetworkGraph(genesis_hash: [UInt8](repeating: 0, count: 32))
+                self.constructor = ChannelManagerConstructor(network: LDKNetwork_Bitcoin, config: UserConfig(), current_blockchain_tip_hash: [UInt8](repeating: 0, count: 32), current_blockchain_tip_height: 0, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor!, net_graph: graph, tx_broadcaster: self.txBroadcaster, logger: self.logger)
+
+//                self.constructor = ChannelManagerConstructor(network: LDKNetwork_Bitcoin, config: UserConfig(), current_blockchain_tip_hash: [UInt8](repeating: 0, count: 32), current_blockchain_tip_height: 0, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor!, net_graph: nil, tx_broadcaster: self.txBroadcaster, logger: self.logger)
+
+
+                self.constructor?.chain_sync_completed(persister: TestChannelManagerPersister(master: self), scorer: nil)
                 self.channelManager = self.constructor!.channelManager
                 self.peerManager = self.constructor!.peerManager
             } else {
@@ -199,8 +205,9 @@ public class HumanObjectPeerTestInstance {
             self.init(master: original.master, _dummy: (), seed: original.seed)
 
             if master.use_chan_manager_constructor {
-                self.constructor = ChannelManagerConstructor(network: LDKNetwork_Bitcoin, config: UserConfig(), current_blockchain_tip_hash: [UInt8](repeating: 0, count: 32), current_blockchain_tip_height: 0, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor!, router: self.router, tx_broadcaster: self.txBroadcaster, logger: self.logger)
-                self.constructor?.chain_sync_completed(persister: TestChannelManagerPersister(master: self))
+                let graph = NetworkGraph(genesis_hash: [UInt8](repeating: 0, count: 32))
+                self.constructor = ChannelManagerConstructor(network: LDKNetwork_Bitcoin, config: UserConfig(), current_blockchain_tip_hash: [UInt8](repeating: 0, count: 32), current_blockchain_tip_height: 0, keys_interface: self.keysInterface, fee_estimator: self.feeEstimator, chain_monitor: self.chainMonitor!, net_graph: graph, tx_broadcaster: self.txBroadcaster, logger: self.logger)
+                self.constructor?.chain_sync_completed(persister: TestChannelManagerPersister(master: self), scorer: nil)
                 self.channelManager = self.constructor!.channelManager
                 self.peerManager = self.constructor!.peerManager
                 self.pendingManagerEvents.append(contentsOf: original.pendingManagerEvents)

ci/LDKSwift/Tests/LDKSwiftTests/LDKSwiftTest.swift

@@ -63,7 +63,7 @@ class LDKSwiftTest: XCTestCase {
                 fee_estimator: feeEstimator,
                 chain_monitor: chainMonitor,
                 filter: filter,
-                router: nil,
+                net_graph: nil,
                 tx_broadcaster: broadcaster,
                 logger: logger
         )
@@ -75,7 +75,7 @@ class LDKSwiftTest: XCTestCase {
         let header = Self.hexStringToBytes(hexString: "f5591ea0b69ae3edc0de11497ffb0fdd91f769ede96c5d662c805364e9bf8b2243e8e5b9d1833eff7cb19abd9fc9da3cd26fe84d718bbf8a336966ae4f7dea6a81372961ffff7f200400000001020000")
         channel_manager.as_Confirm().transactions_confirmed(header: header, txdata: txdata, height: 525)
 
-        channel_manager_constructor.chain_sync_completed(persister: cmPersister)
+        channel_manager_constructor.chain_sync_completed(persister: cmPersister, scorer: nil)
         channel_manager_constructor.interrupt()
     }
 
@@ -114,7 +114,8 @@ class LDKSwiftTest: XCTestCase {
             path.append(extraHop)
         }
 
-        let route = Route(paths_arg: [path])
+        let payee = Payee(pubkey: Self.hexStringToBytes(hexString: destPubkeyHex)!)
+		let route = Route(paths_arg: [path], payee_arg: payee)
     }
 
     func testExtendedActivity() throws {

ci/LDKSwift/Tests/LDKSwiftTests/TestLogger.swift

@@ -10,8 +10,8 @@ import LDKHeaders
 
 class TestLogger: Logger {
 
-    override func log(record: String?) {
-        print("record: \(record)")
-    }
+    override func log(record: Record) {
+		print("some abstract log thing")
+	}
 
 }

ci/run_tests.sh

@@ -9,6 +9,7 @@ find ./LDKSwift/Sources/LDKSwift/* -maxdepth 0 -not -name 'batteries' | xargs -r
 
 # build the bindings
 pushd /ldk-c-bindings/lightning-c-bindings
+export RUSTFLAGS="--cfg=c_bindings"
 cargo build
 popd