Skip to content

Commit f846eb1

Browse files
committed
Improve error logging for unimplemented methods overrides.
1 parent e32ca1c commit f846eb1

34 files changed

+135
-119
lines changed

ci/LDKSwift/Sources/LDKSwift/batteries/ChannelManagerConstructor.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,10 @@ fileprivate class CustomChannelManagerPersister: Persister {
314314
override func persist_graph(network_graph: NetworkGraph) -> Result_NoneErrorZ {
315315
return self.handler.persist_graph(network_graph: network_graph)
316316
}
317+
318+
override func persist_scorer(scorer: Bindings.WriteableScore) -> Bindings.Result_NoneErrorZ {
319+
return self.handler.persist_scorer(scorer: scorer)
320+
}
317321
}
318322

319323
fileprivate class CustomEventHandler: EventHandler {

ci/LDKSwift/Sources/LDKSwift/bindings/Bindings.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6838,7 +6838,7 @@ withUnsafePointer(to: Bindings.array_to_tuple32(array: random_seed_bytes)) { (ra
68386838
*/
68396839

68406840
public class func get_ldk_swift_bindings_version() -> String {
6841-
return "8fe177ad2a9b39971f2c73730f4516d16d6b424c"
6841+
return "e32ca1c04034892ac232a90ad1692bca39ada0a6"
68426842
}
68436843

68446844
}

ci/LDKSwift/Sources/LDKSwift/bindings/traits/Access.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ extension Bindings {
8484

8585
open func get_utxo(genesis_hash: [UInt8]?, short_channel_id: UInt64) -> Result_TxOutAccessErrorZ {
8686
/* EDIT ME */
87-
Bindings.print("Access::get_utxo MUST be overridden!", severity: .ERROR)
87+
Bindings.print("Error: Access::get_utxo MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
8888

8989
abort()
9090
}

ci/LDKSwift/Sources/LDKSwift/bindings/traits/BaseSign.swift

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -188,91 +188,91 @@ extension Bindings {
188188

189189
open func get_per_commitment_point(idx: UInt64) -> [UInt8] {
190190
/* EDIT ME */
191-
Bindings.print("BaseSign::get_per_commitment_point MUST be overridden!", severity: .ERROR)
191+
Bindings.print("Error: BaseSign::get_per_commitment_point MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
192192

193193
abort()
194194
}
195195

196196
open func release_commitment_secret(idx: UInt64) -> [UInt8] {
197197
/* EDIT ME */
198-
Bindings.print("BaseSign::release_commitment_secret MUST be overridden!", severity: .ERROR)
198+
Bindings.print("Error: BaseSign::release_commitment_secret MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
199199

200200
abort()
201201
}
202202

203203
open func validate_holder_commitment(holder_tx: HolderCommitmentTransaction, preimages: [[UInt8]]) -> Result_NoneNoneZ {
204204
/* EDIT ME */
205-
Bindings.print("BaseSign::validate_holder_commitment MUST be overridden!", severity: .ERROR)
205+
Bindings.print("Error: BaseSign::validate_holder_commitment MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
206206

207207
abort()
208208
}
209209

210210
open func channel_keys_id() -> [UInt8] {
211211
/* EDIT ME */
212-
Bindings.print("BaseSign::channel_keys_id MUST be overridden!", severity: .ERROR)
212+
Bindings.print("Error: BaseSign::channel_keys_id MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
213213

214214
abort()
215215
}
216216

217217
open func sign_counterparty_commitment(commitment_tx: CommitmentTransaction, preimages: [[UInt8]]) -> Result_C2Tuple_SignatureCVec_SignatureZZNoneZ {
218218
/* EDIT ME */
219-
Bindings.print("BaseSign::sign_counterparty_commitment MUST be overridden!", severity: .ERROR)
219+
Bindings.print("Error: BaseSign::sign_counterparty_commitment MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
220220

221221
abort()
222222
}
223223

224224
open func validate_counterparty_revocation(idx: UInt64, secret: [UInt8]?) -> Result_NoneNoneZ {
225225
/* EDIT ME */
226-
Bindings.print("BaseSign::validate_counterparty_revocation MUST be overridden!", severity: .ERROR)
226+
Bindings.print("Error: BaseSign::validate_counterparty_revocation MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
227227

228228
abort()
229229
}
230230

231231
open func sign_holder_commitment_and_htlcs(commitment_tx: HolderCommitmentTransaction) -> Result_C2Tuple_SignatureCVec_SignatureZZNoneZ {
232232
/* EDIT ME */
233-
Bindings.print("BaseSign::sign_holder_commitment_and_htlcs MUST be overridden!", severity: .ERROR)
233+
Bindings.print("Error: BaseSign::sign_holder_commitment_and_htlcs MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
234234

235235
abort()
236236
}
237237

238238
open func sign_justice_revoked_output(justice_tx: [UInt8], input: UInt, amount: UInt64, per_commitment_key: [UInt8]?) -> Result_SignatureNoneZ {
239239
/* EDIT ME */
240-
Bindings.print("BaseSign::sign_justice_revoked_output MUST be overridden!", severity: .ERROR)
240+
Bindings.print("Error: BaseSign::sign_justice_revoked_output MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
241241

242242
abort()
243243
}
244244

245245
open func sign_justice_revoked_htlc(justice_tx: [UInt8], input: UInt, amount: UInt64, per_commitment_key: [UInt8]?, htlc: HTLCOutputInCommitment) -> Result_SignatureNoneZ {
246246
/* EDIT ME */
247-
Bindings.print("BaseSign::sign_justice_revoked_htlc MUST be overridden!", severity: .ERROR)
247+
Bindings.print("Error: BaseSign::sign_justice_revoked_htlc MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
248248

249249
abort()
250250
}
251251

252252
open func sign_counterparty_htlc_transaction(htlc_tx: [UInt8], input: UInt, amount: UInt64, per_commitment_point: [UInt8], htlc: HTLCOutputInCommitment) -> Result_SignatureNoneZ {
253253
/* EDIT ME */
254-
Bindings.print("BaseSign::sign_counterparty_htlc_transaction MUST be overridden!", severity: .ERROR)
254+
Bindings.print("Error: BaseSign::sign_counterparty_htlc_transaction MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
255255

256256
abort()
257257
}
258258

259259
open func sign_closing_transaction(closing_tx: ClosingTransaction) -> Result_SignatureNoneZ {
260260
/* EDIT ME */
261-
Bindings.print("BaseSign::sign_closing_transaction MUST be overridden!", severity: .ERROR)
261+
Bindings.print("Error: BaseSign::sign_closing_transaction MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
262262

263263
abort()
264264
}
265265

266266
open func sign_channel_announcement(msg: UnsignedChannelAnnouncement) -> Result_C2Tuple_SignatureSignatureZNoneZ {
267267
/* EDIT ME */
268-
Bindings.print("BaseSign::sign_channel_announcement MUST be overridden!", severity: .ERROR)
268+
Bindings.print("Error: BaseSign::sign_channel_announcement MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
269269

270270
abort()
271271
}
272272

273273
open func ready_channel(channel_parameters: ChannelTransactionParameters) -> Void {
274274
/* EDIT ME */
275-
Bindings.print("BaseSign::ready_channel MUST be overridden!", severity: .ERROR)
275+
Bindings.print("Error: BaseSign::ready_channel MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
276276

277277
abort()
278278
}

ci/LDKSwift/Sources/LDKSwift/bindings/traits/BindingsType.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,21 +118,21 @@ extension Bindings {
118118

119119
open func type_id() -> UInt16 {
120120
/* EDIT ME */
121-
Bindings.print("BindingsType::type_id MUST be overridden!", severity: .ERROR)
121+
Bindings.print("Error: BindingsType::type_id MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
122122

123123
abort()
124124
}
125125

126126
open func debug_str() -> String {
127127
/* EDIT ME */
128-
Bindings.print("BindingsType::debug_str MUST be overridden!", severity: .ERROR)
128+
Bindings.print("Error: BindingsType::debug_str MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
129129

130130
abort()
131131
}
132132

133133
open func write() -> [UInt8] {
134134
/* EDIT ME */
135-
Bindings.print("BindingsType::write MUST be overridden!", severity: .ERROR)
135+
Bindings.print("Error: BindingsType::write MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
136136

137137
abort()
138138
}

ci/LDKSwift/Sources/LDKSwift/bindings/traits/BroadcasterInterface.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ extension Bindings {
7979

8080
open func broadcast_transaction(tx: [UInt8]) -> Void {
8181
/* EDIT ME */
82-
Bindings.print("BroadcasterInterface::broadcast_transaction MUST be overridden!", severity: .ERROR)
82+
Bindings.print("Error: BroadcasterInterface::broadcast_transaction MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
8383

8484
abort()
8585
}

ci/LDKSwift/Sources/LDKSwift/bindings/traits/ChannelMessageHandler.swift

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -247,154 +247,154 @@ let msg = Shutdown(pointer: msgPointer.pointee).dangle().clone();
247247

248248
open func handle_open_channel(their_node_id: [UInt8], their_features: InitFeatures, msg: OpenChannel) -> Void {
249249
/* EDIT ME */
250-
Bindings.print("ChannelMessageHandler::handle_open_channel MUST be overridden!", severity: .ERROR)
250+
Bindings.print("Error: ChannelMessageHandler::handle_open_channel MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
251251

252252
abort()
253253
}
254254

255255
open func handle_accept_channel(their_node_id: [UInt8], their_features: InitFeatures, msg: AcceptChannel) -> Void {
256256
/* EDIT ME */
257-
Bindings.print("ChannelMessageHandler::handle_accept_channel MUST be overridden!", severity: .ERROR)
257+
Bindings.print("Error: ChannelMessageHandler::handle_accept_channel MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
258258

259259
abort()
260260
}
261261

262262
open func handle_funding_created(their_node_id: [UInt8], msg: FundingCreated) -> Void {
263263
/* EDIT ME */
264-
Bindings.print("ChannelMessageHandler::handle_funding_created MUST be overridden!", severity: .ERROR)
264+
Bindings.print("Error: ChannelMessageHandler::handle_funding_created MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
265265

266266
abort()
267267
}
268268

269269
open func handle_funding_signed(their_node_id: [UInt8], msg: FundingSigned) -> Void {
270270
/* EDIT ME */
271-
Bindings.print("ChannelMessageHandler::handle_funding_signed MUST be overridden!", severity: .ERROR)
271+
Bindings.print("Error: ChannelMessageHandler::handle_funding_signed MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
272272

273273
abort()
274274
}
275275

276276
open func handle_channel_ready(their_node_id: [UInt8], msg: ChannelReady) -> Void {
277277
/* EDIT ME */
278-
Bindings.print("ChannelMessageHandler::handle_channel_ready MUST be overridden!", severity: .ERROR)
278+
Bindings.print("Error: ChannelMessageHandler::handle_channel_ready MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
279279

280280
abort()
281281
}
282282

283283
open func handle_shutdown(their_node_id: [UInt8], their_features: InitFeatures, msg: Shutdown) -> Void {
284284
/* EDIT ME */
285-
Bindings.print("ChannelMessageHandler::handle_shutdown MUST be overridden!", severity: .ERROR)
285+
Bindings.print("Error: ChannelMessageHandler::handle_shutdown MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
286286

287287
abort()
288288
}
289289

290290
open func handle_closing_signed(their_node_id: [UInt8], msg: ClosingSigned) -> Void {
291291
/* EDIT ME */
292-
Bindings.print("ChannelMessageHandler::handle_closing_signed MUST be overridden!", severity: .ERROR)
292+
Bindings.print("Error: ChannelMessageHandler::handle_closing_signed MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
293293

294294
abort()
295295
}
296296

297297
open func handle_update_add_htlc(their_node_id: [UInt8], msg: UpdateAddHTLC) -> Void {
298298
/* EDIT ME */
299-
Bindings.print("ChannelMessageHandler::handle_update_add_htlc MUST be overridden!", severity: .ERROR)
299+
Bindings.print("Error: ChannelMessageHandler::handle_update_add_htlc MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
300300

301301
abort()
302302
}
303303

304304
open func handle_update_fulfill_htlc(their_node_id: [UInt8], msg: UpdateFulfillHTLC) -> Void {
305305
/* EDIT ME */
306-
Bindings.print("ChannelMessageHandler::handle_update_fulfill_htlc MUST be overridden!", severity: .ERROR)
306+
Bindings.print("Error: ChannelMessageHandler::handle_update_fulfill_htlc MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
307307

308308
abort()
309309
}
310310

311311
open func handle_update_fail_htlc(their_node_id: [UInt8], msg: UpdateFailHTLC) -> Void {
312312
/* EDIT ME */
313-
Bindings.print("ChannelMessageHandler::handle_update_fail_htlc MUST be overridden!", severity: .ERROR)
313+
Bindings.print("Error: ChannelMessageHandler::handle_update_fail_htlc MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
314314

315315
abort()
316316
}
317317

318318
open func handle_update_fail_malformed_htlc(their_node_id: [UInt8], msg: UpdateFailMalformedHTLC) -> Void {
319319
/* EDIT ME */
320-
Bindings.print("ChannelMessageHandler::handle_update_fail_malformed_htlc MUST be overridden!", severity: .ERROR)
320+
Bindings.print("Error: ChannelMessageHandler::handle_update_fail_malformed_htlc MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
321321

322322
abort()
323323
}
324324

325325
open func handle_commitment_signed(their_node_id: [UInt8], msg: CommitmentSigned) -> Void {
326326
/* EDIT ME */
327-
Bindings.print("ChannelMessageHandler::handle_commitment_signed MUST be overridden!", severity: .ERROR)
327+
Bindings.print("Error: ChannelMessageHandler::handle_commitment_signed MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
328328

329329
abort()
330330
}
331331

332332
open func handle_revoke_and_ack(their_node_id: [UInt8], msg: RevokeAndACK) -> Void {
333333
/* EDIT ME */
334-
Bindings.print("ChannelMessageHandler::handle_revoke_and_ack MUST be overridden!", severity: .ERROR)
334+
Bindings.print("Error: ChannelMessageHandler::handle_revoke_and_ack MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
335335

336336
abort()
337337
}
338338

339339
open func handle_update_fee(their_node_id: [UInt8], msg: UpdateFee) -> Void {
340340
/* EDIT ME */
341-
Bindings.print("ChannelMessageHandler::handle_update_fee MUST be overridden!", severity: .ERROR)
341+
Bindings.print("Error: ChannelMessageHandler::handle_update_fee MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
342342

343343
abort()
344344
}
345345

346346
open func handle_announcement_signatures(their_node_id: [UInt8], msg: AnnouncementSignatures) -> Void {
347347
/* EDIT ME */
348-
Bindings.print("ChannelMessageHandler::handle_announcement_signatures MUST be overridden!", severity: .ERROR)
348+
Bindings.print("Error: ChannelMessageHandler::handle_announcement_signatures MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
349349

350350
abort()
351351
}
352352

353353
open func peer_disconnected(their_node_id: [UInt8], no_connection_possible: Bool) -> Void {
354354
/* EDIT ME */
355-
Bindings.print("ChannelMessageHandler::peer_disconnected MUST be overridden!", severity: .ERROR)
355+
Bindings.print("Error: ChannelMessageHandler::peer_disconnected MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
356356

357357
abort()
358358
}
359359

360360
open func peer_connected(their_node_id: [UInt8], msg: Init) -> Void {
361361
/* EDIT ME */
362-
Bindings.print("ChannelMessageHandler::peer_connected MUST be overridden!", severity: .ERROR)
362+
Bindings.print("Error: ChannelMessageHandler::peer_connected MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
363363

364364
abort()
365365
}
366366

367367
open func handle_channel_reestablish(their_node_id: [UInt8], msg: ChannelReestablish) -> Void {
368368
/* EDIT ME */
369-
Bindings.print("ChannelMessageHandler::handle_channel_reestablish MUST be overridden!", severity: .ERROR)
369+
Bindings.print("Error: ChannelMessageHandler::handle_channel_reestablish MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
370370

371371
abort()
372372
}
373373

374374
open func handle_channel_update(their_node_id: [UInt8], msg: ChannelUpdate) -> Void {
375375
/* EDIT ME */
376-
Bindings.print("ChannelMessageHandler::handle_channel_update MUST be overridden!", severity: .ERROR)
376+
Bindings.print("Error: ChannelMessageHandler::handle_channel_update MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
377377

378378
abort()
379379
}
380380

381381
open func handle_error(their_node_id: [UInt8], msg: ErrorMessage) -> Void {
382382
/* EDIT ME */
383-
Bindings.print("ChannelMessageHandler::handle_error MUST be overridden!", severity: .ERROR)
383+
Bindings.print("Error: ChannelMessageHandler::handle_error MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
384384

385385
abort()
386386
}
387387

388388
open func provided_node_features() -> NodeFeatures {
389389
/* EDIT ME */
390-
Bindings.print("ChannelMessageHandler::provided_node_features MUST be overridden!", severity: .ERROR)
390+
Bindings.print("Error: ChannelMessageHandler::provided_node_features MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
391391

392392
abort()
393393
}
394394

395395
open func provided_init_features(their_node_id: [UInt8]) -> InitFeatures {
396396
/* EDIT ME */
397-
Bindings.print("ChannelMessageHandler::provided_init_features MUST be overridden!", severity: .ERROR)
397+
Bindings.print("Error: ChannelMessageHandler::provided_init_features MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
398398

399399
abort()
400400
}

ci/LDKSwift/Sources/LDKSwift/bindings/traits/Confirm.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,28 +121,28 @@ extension Bindings {
121121

122122
open func transactions_confirmed(header: [UInt8]?, txdata: [LDKC2Tuple_usizeTransactionZ], height: UInt32) -> Void {
123123
/* EDIT ME */
124-
Bindings.print("Confirm::transactions_confirmed MUST be overridden!", severity: .ERROR)
124+
Bindings.print("Error: Confirm::transactions_confirmed MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
125125

126126
abort()
127127
}
128128

129129
open func transaction_unconfirmed(txid: [UInt8]?) -> Void {
130130
/* EDIT ME */
131-
Bindings.print("Confirm::transaction_unconfirmed MUST be overridden!", severity: .ERROR)
131+
Bindings.print("Error: Confirm::transaction_unconfirmed MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
132132

133133
abort()
134134
}
135135

136136
open func best_block_updated(header: [UInt8]?, height: UInt32) -> Void {
137137
/* EDIT ME */
138-
Bindings.print("Confirm::best_block_updated MUST be overridden!", severity: .ERROR)
138+
Bindings.print("Error: Confirm::best_block_updated MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
139139

140140
abort()
141141
}
142142

143143
open func get_relevant_txids() -> [[UInt8]] {
144144
/* EDIT ME */
145-
Bindings.print("Confirm::get_relevant_txids MUST be overridden!", severity: .ERROR)
145+
Bindings.print("Error: Confirm::get_relevant_txids MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
146146

147147
abort()
148148
}

ci/LDKSwift/Sources/LDKSwift/bindings/traits/CustomMessageHandler.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ extension Bindings {
9393

9494
open func handle_custom_message(msg: BindingsType, sender_node_id: [UInt8]) -> Result_NoneLightningErrorZ {
9595
/* EDIT ME */
96-
Bindings.print("CustomMessageHandler::handle_custom_message MUST be overridden!", severity: .ERROR)
96+
Bindings.print("Error: CustomMessageHandler::handle_custom_message MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
9797

9898
abort()
9999
}
100100

101101
open func get_and_clear_pending_msg() -> [LDKC2Tuple_PublicKeyTypeZ] {
102102
/* EDIT ME */
103-
Bindings.print("CustomMessageHandler::get_and_clear_pending_msg MUST be overridden!", severity: .ERROR)
103+
Bindings.print("Error: CustomMessageHandler::get_and_clear_pending_msg MUST be overridden! Offending class: \(String(describing: self)). Aborting.", severity: .ERROR)
104104

105105
abort()
106106
}

0 commit comments

Comments
 (0)