ndb: make NostrEvents immutable

Since we can't mutate NdbNotes, let's update the existing codebase to generate and sign ids on NostrEvent constructions. This will allow us to match NdbNote's constructor
2023-07-25 08:58:06 -07:00
parent e3c04465fc
commit 2f8aa29e92
47 changed files with 2211 additions and 462 deletions
--- a/damusTests/EventGroupViewTests.swift
+++ b/damusTests/EventGroupViewTests.swift
@@ -29,14 +29,17 @@ final class EventGroupViewTests: XCTestCase {
        let damusState = test_damus_state()

        let encodedPost = "{\"id\": \"8ba545ab96959fe0ce7db31bc10f3ac3aa5353bc4428dbf1e56a7be7062516db\",\"pubkey\": \"7e27509ccf1e297e1df164912a43406218f8bd80129424c3ef798ca3ef5c8444\",\"created_at\": 1677013417,\"kind\": 1,\"tags\": [],\"content\": \"hello\",\"sig\": \"93684f15eddf11f42afbdd81828ee9fc35350344d8650c78909099d776e9ad8d959cd5c4bff7045be3b0b255144add43d0feef97940794a1bc9c309791bebe4a\"}"
-        let repost1 = NostrEvent(id: "", content: encodedPost, pubkey: "pk1", kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)
-        let repost2 = NostrEvent(id: "", content: encodedPost, pubkey: "pk2", kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)
-        let repost3 = NostrEvent(id: "", content: encodedPost, pubkey: "pk3", kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)
+        let pk1 = Keypair(pubkey: "pk1", privkey: nil)
+        let pk2 = Keypair(pubkey: "pk2", privkey: nil)
+        let pk3 = Keypair(pubkey: "pk3", privkey: nil)
+        let repost1 = NostrEvent(content: encodedPost, keypair: pk1, kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)!
+        let repost2 = NostrEvent(content: encodedPost, keypair: pk2, kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)!
+        let repost3 = NostrEvent(content: encodedPost, keypair: pk3, kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)!

        XCTAssertEqual(event_group_unique_pubkeys(profiles: damusState.profiles, group: .repost(EventGroup(events: []))), [])
-        XCTAssertEqual(event_group_unique_pubkeys(profiles: damusState.profiles, group: .repost(EventGroup(events: [repost1]))), ["pk1"])
-        XCTAssertEqual(event_group_unique_pubkeys(profiles: damusState.profiles, group: .repost(EventGroup(events: [repost1, repost2]))), ["pk1", "pk2"])
-        XCTAssertEqual(event_group_unique_pubkeys(profiles: damusState.profiles, group: .repost(EventGroup(events: [repost1, repost2, repost3]))), ["pk1", "pk2", "pk3"])
+        XCTAssertEqual(event_group_unique_pubkeys(profiles: damusState.profiles, group: .repost(EventGroup(events: [repost1]))), [pk1.pubkey])
+        XCTAssertEqual(event_group_unique_pubkeys(profiles: damusState.profiles, group: .repost(EventGroup(events: [repost1, repost2]))), [pk1.pubkey, pk2.pubkey])
+        XCTAssertEqual(event_group_unique_pubkeys(profiles: damusState.profiles, group: .repost(EventGroup(events: [repost1, repost2, repost3]))), [pk1.pubkey, pk2.pubkey, pk3.pubkey])
    }

    func testReactingToText() throws {
@@ -44,20 +47,25 @@ final class EventGroupViewTests: XCTestCase {
        let damusState = test_damus_state()

        let encodedPost = "{\"id\": \"8ba545ab96959fe0ce7db31bc10f3ac3aa5353bc4428dbf1e56a7be7062516db\",\"pubkey\": \"7e27509ccf1e297e1df164912a43406218f8bd80129424c3ef798ca3ef5c8444\",\"created_at\": 1677013417,\"kind\": 1,\"tags\": [],\"content\": \"hello\",\"sig\": \"93684f15eddf11f42afbdd81828ee9fc35350344d8650c78909099d776e9ad8d959cd5c4bff7045be3b0b255144add43d0feef97940794a1bc9c309791bebe4a\"}"
-        let repost1 = NostrEvent(id: "", content: encodedPost, pubkey: "pk1", kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)
-        let repost2 = NostrEvent(id: "", content: encodedPost, pubkey: "pk2", kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)
-        let repost3 = NostrEvent(id: "", content: encodedPost, pubkey: "pk3", kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)
+
+        let pk1 = Keypair(pubkey: "pk1", privkey: nil)
+        let pk2 = Keypair(pubkey: "pk2", privkey: nil)
+        let pk3 = Keypair(pubkey: "pk3", privkey: nil)
+
+        let repost1 = NostrEvent(content: encodedPost, keypair: pk1, kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)!
+        let repost2 = NostrEvent(content: encodedPost, keypair: pk2, kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)!
+        let repost3 = NostrEvent(content: encodedPost, keypair: pk3, kind: NostrKind.boost.rawValue, tags: [], createdAt: 1)!

        XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [])), ev: test_event, pubkeys: [], locale: enUsLocale), "??")
-        XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1])), ev: test_event, pubkeys: ["pk1"], locale: enUsLocale), "pk1:pk1 reposted a note you were tagged in")
-        XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2])), ev: test_event, pubkeys: ["pk1", "pk2"], locale: enUsLocale), "pk1:pk1 and pk2:pk2 reposted a note you were tagged in")
-        XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2, repost2])), ev: test_event, pubkeys: ["pk1", "pk2", "pk3"], locale: enUsLocale), "pk1:pk1 and 2 others reposted a note you were tagged in")
+        XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1])), ev: test_event, pubkeys: [pk1.pubkey], locale: enUsLocale), "pk1:pk1 reposted a note you were tagged in")
+        XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2])), ev: test_event, pubkeys: [pk1.pubkey, pk2.pubkey], locale: enUsLocale), "pk1:pk1 and pk2:pk2 reposted a note you were tagged in")
+        XCTAssertEqual(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2, repost2])), ev: test_event, pubkeys: [pk1.pubkey, pk2.pubkey, pk3.pubkey], locale: enUsLocale), "pk1:pk1 and 2 others reposted a note you were tagged in")

        Bundle.main.localizations.map { Locale(identifier: $0) }.forEach {
            XCTAssertNoThrow(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [])), ev: test_event, pubkeys: [], locale: $0), "??")
-            XCTAssertNoThrow(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1])), ev: test_event, pubkeys: ["pk1"], locale: $0))
-            XCTAssertNoThrow(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2])), ev: test_event, pubkeys: ["pk1", "pk2"], locale: $0))
-            XCTAssertNoThrow(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2, repost3])), ev: test_event, pubkeys: ["pk1", "pk2", "pk3"], locale: $0))
+            XCTAssertNoThrow(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1])), ev: test_event, pubkeys: [pk1.pubkey], locale: $0))
+            XCTAssertNoThrow(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2])), ev: test_event, pubkeys: [pk1.pubkey, pk2.pubkey], locale: $0))
+            XCTAssertNoThrow(reacting_to_text(profiles: damusState.profiles, our_pubkey: damusState.pubkey, group: .repost(EventGroup(events: [repost1, repost2, repost3])), ev: test_event, pubkeys: [pk1.pubkey, pk2.pubkey, pk3.pubkey], locale: $0))
        }
    }

--- a/damusTests/LikeTests.swift
+++ b/damusTests/LikeTests.swift
@@ -19,31 +19,25 @@ class LikeTests: XCTestCase {
    }

    func testLikeHasNotification() throws {
-        let privkey = "0fc2092231f958f8d57d66f5e238bb45b6a2571f44c0ce024bbc6f3a9c8a15fe"
-        let pubkey  = "30c6d1dc7f7c156794fa15055e651b758a61b99f50fcf759de59386050bf6ae2"
-        let liked = NostrEvent(content: "awesome #[0] post", pubkey: "orig_pk", tags: [["p", "cindy"], ["e", "bob"]])
-        liked.calculate_id()
+        let liked = NostrEvent(content: "awesome #[0] post", keypair: test_keypair, tags: [["p", "cindy"], ["e", "bob"]])!
        let id = liked.id
-        let like_ev = make_like_event(pubkey: pubkey, privkey: privkey, liked: liked)
-        
-        XCTAssertTrue(like_ev.references(id: "orig_pk", key: "p"))
+        let like_ev = make_like_event(keypair: test_keypair_full, liked: liked)!
+
+        XCTAssertTrue(like_ev.references(id: test_keypair.pubkey, key: "p"))
        XCTAssertTrue(like_ev.references(id: "cindy", key: "p"))
        XCTAssertTrue(like_ev.references(id: "bob", key: "e"))
        XCTAssertEqual(like_ev.last_refid()!.ref_id, id)
    }

    func testToReactionEmoji() {
-        let privkey = "0fc2092231f958f8d57d66f5e238bb45b6a2571f44c0ce024bbc6f3a9c8a15fe"
-        let pubkey  = "30c6d1dc7f7c156794fa15055e651b758a61b99f50fcf759de59386050bf6ae2"
-        let liked = NostrEvent(content: "awesome #[0] post", pubkey: "orig_pk", tags: [["p", "cindy"], ["e", "bob"]])
-        liked.calculate_id()
+        let liked = NostrEvent(content: "awesome #[0] post", keypair: test_keypair, tags: [["p", "cindy"], ["e", "bob"]])!

-        let emptyReaction = make_like_event(pubkey: pubkey, privkey: privkey, liked: liked, content: "")
-        let plusReaction = make_like_event(pubkey: pubkey, privkey: privkey, liked: liked, content: "+")
-        let minusReaction = make_like_event(pubkey: pubkey, privkey: privkey, liked: liked, content: "-")
-        let heartReaction = make_like_event(pubkey: pubkey, privkey: privkey, liked: liked, content: "❤️")
-        let thumbsUpReaction = make_like_event(pubkey: pubkey, privkey: privkey, liked: liked, content: "👍")
-        let shakaReaction = make_like_event(pubkey: pubkey, privkey: privkey, liked: liked, content: "🤙")
+        let emptyReaction = make_like_event(keypair: test_keypair_full, liked: liked, content: "")!
+        let plusReaction = make_like_event(keypair: test_keypair_full, liked: liked, content: "+")!
+        let minusReaction = make_like_event(keypair: test_keypair_full, liked: liked, content: "-")!
+        let heartReaction = make_like_event(keypair: test_keypair_full, liked: liked, content: "❤️")!
+        let thumbsUpReaction = make_like_event(keypair: test_keypair_full, liked: liked, content: "👍")!
+        let shakaReaction = make_like_event(keypair: test_keypair_full, liked: liked, content: "🤙")!

        XCTAssertEqual(to_reaction_emoji(ev: emptyReaction), "❤️")
        XCTAssertEqual(to_reaction_emoji(ev: plusReaction), "❤️")
--- a/damusTests/ReplyTests.swift
+++ b/damusTests/ReplyTests.swift
@@ -331,8 +331,8 @@ class ReplyTests: XCTestCase {
        let reply_ref = ReferencedId(ref_id: evid, relay_id: nil, key: "e")
        let blocks = parse_post_blocks(content: content)
        let post = NostrPost(content: content, references: [reply_ref])
-        let ev = post_to_event(post: post, privkey: evid, pubkey: pk)
-        
+        let ev = post_to_event(post: post, keypair: test_keypair_full)!
+
        XCTAssertEqual(ev.tags.count, 2)
        XCTAssertEqual(blocks.count, 3)
        XCTAssertEqual(blocks[1].is_mention, .pubkey(hex_pk))
@@ -347,8 +347,8 @@ class ReplyTests: XCTestCase {
        let reply_ref = ReferencedId(ref_id: evid, relay_id: nil, key: "e")
        let blocks = parse_post_blocks(content: content)
        let post = NostrPost(content: content, references: [reply_ref])
-        let ev = post_to_event(post: post, privkey: evid, pubkey: pk)
-        
+        let ev = post_to_event(post: post, keypair: test_keypair_full)!
+
        XCTAssertEqual(ev.tags.count, 2)
        XCTAssertEqual(blocks.count, 3)
        XCTAssertEqual(blocks[1].is_mention, .pubkey(hex_pk))
@@ -367,7 +367,7 @@ class ReplyTests: XCTestCase {
        ]
        
        let post = NostrPost(content: "this is a (@\(npub)) mention", references: refs)
-        let ev = post_to_event(post: post, privkey: privkey, pubkey: pubkey)
+        let ev = post_to_event(post: post, keypair: test_keypair_full)!
        
        XCTAssertEqual(ev.content, "this is a (nostr:\(npub)) mention")
        XCTAssertEqual(ev.tags[2][1], pubkey)
--- a/damusTests/UserSearchCacheTests.swift
+++ b/damusTests/UserSearchCacheTests.swift
@@ -116,7 +116,6 @@ final class UserSearchCacheTests: XCTestCase {

    private func createContactsEventWithPetnames(pubkeysToPetnames: [String: String]) throws -> NostrEvent {
        let keypair = try XCTUnwrap(keypair)
-        let privkey = try XCTUnwrap(keypair.privkey)

        let bootstrapRelays = load_bootstrap_relays(pubkey: keypair.pubkey)
        let relayInfo = RelayInfo(read: true, write: true)
@@ -132,13 +131,7 @@ final class UserSearchCacheTests: XCTestCase {
            ["p", $0.element.key, "", $0.element.value]
        }

-        let ev = NostrEvent(content: relayJson,
-                            pubkey: keypair.pubkey,
-                            kind: NostrKind.contacts.rawValue,
-                            tags: tags)
-        ev.calculate_id()
-        ev.sign(privkey: privkey)
-        return ev
+        return NostrEvent(content: relayJson, keypair: keypair, kind: NostrKind.contacts.rawValue, tags: tags)!
    }

 }
--- a/damusTests/damusTests.swift
+++ b/damusTests/damusTests.swift
@@ -180,11 +180,9 @@ class damusTests: XCTestCase {
    }
    
    func testMakeHashtagPost() {
-        let privkey = "d05f5fcceef3e4529703f62a29222d6ee2d1b7bf1f24729b5e01df7c633cec8a"
-        let pubkey = "6e59d3b78b1c1490a6489c94405873b57d8ef398a830ae5e39608f4107e9a790"
        let post = NostrPost(content: "#damus some content #bitcoin derp", references: [])
-        let ev = post_to_event(post: post, privkey: privkey, pubkey: pubkey)
-        
+        let ev = post_to_event(post: post, keypair: test_keypair_full)!
+
        XCTAssertEqual(ev.tags.count, 2)
        XCTAssertEqual(ev.content, "#damus some content #bitcoin derp")
        XCTAssertEqual(ev.tags[0][0], "t")