mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 00:05:18 +00:00
PeerID 11/n: Noise types use PeerID + create separate files (#750)
* Noise types use PeerID * Fix tests * Extract `NoiseSessionManager` into a separate file * Extract `NoiseSessionState` into a separate file * Remove `failed` state from `NoiseSessionState` * Extract `NoiseSessionError` into a separate file
This commit is contained in:
@@ -484,10 +484,13 @@ final class IntegrationTests: XCTestCase {
|
||||
|
||||
guard let aliceManager = noiseManagers["Alice"],
|
||||
let bobManager = noiseManagers["Bob"],
|
||||
let alicePeerID = nodes["Alice"]?.peerID,
|
||||
let bobPeerID = nodes["Bob"]?.peerID else {
|
||||
let aliceStringPeerID = nodes["Alice"]?.peerID,
|
||||
let bobStringPeerID = nodes["Bob"]?.peerID else {
|
||||
return XCTFail("Missing managers or peer IDs")
|
||||
}
|
||||
|
||||
let alicePeerID = PeerID(str: aliceStringPeerID)
|
||||
let bobPeerID = PeerID(str: bobStringPeerID)
|
||||
|
||||
// Baseline: encrypt from Alice, decrypt at Bob
|
||||
let plaintext1 = Data("hello-secure".utf8)
|
||||
@@ -587,9 +590,9 @@ final class IntegrationTests: XCTestCase {
|
||||
|
||||
// MARK: - Helper Methods
|
||||
|
||||
private func createNode(_ name: String, peerID: String) {
|
||||
private func createNode(_ name: String, peerID: PeerID) {
|
||||
let node = MockBluetoothMeshService()
|
||||
node.myPeerID = peerID
|
||||
node.myPeerID = peerID.id
|
||||
node.mockNickname = name
|
||||
nodes[name] = node
|
||||
|
||||
@@ -666,9 +669,9 @@ final class IntegrationTests: XCTestCase {
|
||||
let peer1ID = nodes[node1]?.peerID,
|
||||
let peer2ID = nodes[node2]?.peerID else { return }
|
||||
|
||||
let msg1 = try manager1.initiateHandshake(with: peer2ID)
|
||||
let msg2 = try manager2.handleIncomingHandshake(from: peer1ID, message: msg1)!
|
||||
let msg3 = try manager1.handleIncomingHandshake(from: peer2ID, message: msg2)!
|
||||
_ = try manager2.handleIncomingHandshake(from: peer1ID, message: msg3)
|
||||
let msg1 = try manager1.initiateHandshake(with: PeerID(str: peer2ID))
|
||||
let msg2 = try manager2.handleIncomingHandshake(from: PeerID(str: peer1ID), message: msg1)!
|
||||
let msg3 = try manager1.handleIncomingHandshake(from: PeerID(str: peer2ID), message: msg2)!
|
||||
_ = try manager2.handleIncomingHandshake(from: PeerID(str: peer1ID), message: msg3)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user