Skip to content

Commit 698e90d

Browse files
committed
Fix unit test bugs and add pointer to integer conversion tracking.
1 parent f98080e commit 698e90d

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

ci/LDKSwift/Tests/LDKSwiftTests/HumanObjectPeerTestInstance.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -627,12 +627,12 @@ public class HumanObjectPeerTestInstance {
627627
XCTAssertEqual(usableChannelsA.count, 1)
628628
XCTAssertEqual(usableChannelsB.count, 1)
629629

630-
let peer1Event = try! await peer1.getManagerEvents(expectedCount: 1)[0]
630+
let peer1Event = try! await peer1.getManagerEvents(expectedCount: 2)[1]
631631
guard case .ChannelReady = peer1Event.getValueType() else {
632632
return XCTAssert(false, "Expected .ChannelReady, got \(peer1Event.getValueType())")
633633
}
634634

635-
let peer2Event = try! await peer2.getManagerEvents(expectedCount: 1)[0]
635+
let peer2Event = try! await peer2.getManagerEvents(expectedCount: 2)[1]
636636
guard case .ChannelReady = peer2Event.getValueType() else {
637637
return XCTAssert(false, "Expected .ChannelReady, got \(peer2Event.getValueType())")
638638
}

out/Bindings.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,15 @@
150150
public class func instanceToPointer(instance: NativeTraitWrapper) -> UnsafeMutableRawPointer {
151151
let key = instance.globalInstanceNumber
152152
let pointer = UnsafeMutableRawPointer(bitPattern: key)!
153+
print("Caching instance \(key) -> \(pointer)", severity: .DEBUG)
153154
// don't automatically cache the trait instance
154155
Self.nativelyExposedInstances[instance.globalInstanceNumber] = instance
155156
return pointer
156157
}
157158

158159
public class func pointerToInstance<T: NativeTraitWrapper>(pointer: UnsafeRawPointer, sourceMarker: String?) -> T{
159160
let key = UInt(bitPattern: pointer)
161+
print("Looking up instance \(pointer) -> \(key)", severity: .DEBUG)
160162
let referenceCount = Self.nativelyExposedInstanceReferenceCounter[key] ?? 0
161163
if referenceCount < 1 {
162164
print("Bad lookup: non-positive reference count for instance \(key): \(referenceCount)!", severity: .ERROR)

out/VersionDescriptor.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
extension Bindings {
77
public class func getLDKSwiftBindingsSerializationHash() -> String {
8-
return "090938220b5365ba0727f9eb4420c0f4cc0d12d65a2810a014fa06e29e7d3ea7"
8+
return "951a04e511767a058d66c5eced47089c2d812e2c268bdb52749dad262cd92699"
99
}
1010
public class func getLDKSwiftBindingsVersion() -> String {
11-
return "0.0.114-22-gb2333da3-dirty"
11+
return "0.0.114-25-gf98080ee-dirty"
1212
}
1313
public class func getLDKSwiftBindingsCommitHash() -> String {
14-
return "b2333da3e5d0122faa70102c6e228ee2ade21c71"
14+
return "f98080ee8136bf0c9502a55bbc4c65e748eba96e"
1515
}
1616
}
1717

src/generation/bindings_file_generator.mts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,15 @@ export default class BindingsFileGenerator extends BaseTypeGenerator<GlobalBindi
221221
public class func instanceToPointer(instance: NativeTraitWrapper) -> UnsafeMutableRawPointer {
222222
let key = instance.globalInstanceNumber
223223
let pointer = UnsafeMutableRawPointer(bitPattern: key)!
224+
print("Caching instance \\(key) -> \\(pointer)", severity: .DEBUG)
224225
// don't automatically cache the trait instance
225226
Self.nativelyExposedInstances[instance.globalInstanceNumber] = instance
226227
return pointer
227228
}
228229
229230
public class func pointerToInstance<T: NativeTraitWrapper>(pointer: UnsafeRawPointer, sourceMarker: String?) -> T{
230231
let key = UInt(bitPattern: pointer)
232+
print("Looking up instance \\(pointer) -> \\(key)", severity: .DEBUG)
231233
let referenceCount = Self.nativelyExposedInstanceReferenceCounter[key] ?? 0
232234
if referenceCount < 1 {
233235
print("Bad lookup: non-positive reference count for instance \\(key): \\(referenceCount)!", severity: .ERROR)

0 commit comments

Comments
 (0)