test: fix broken tests

Signed-off-by: William Casarin <jb55@jb55.com>

damus/Core/Nostr/ContentParsing.swift

@@ -20,45 +20,6 @@ enum NoteContent {
     }
 }
 
-func parsed_blocks_finish(bs: inout note_blocks, tags: TagsSequence?) -> Blocks {
-    var out: [Block] = []
-
-    var i = 0
-    while (i < bs.num_blocks) {
-        let block = bs.blocks[i]
-
-        if let converted = Block(block, tags: tags) {
-            out.append(converted)
-        }
-
-        i += 1
-    }
-
-    let words = Int(bs.words)
-    blocks_free(&bs)
-
-    return Blocks(words: words, blocks: out)
-
-}
-
-func parse_note_content(content: NoteContent) -> Blocks {
-    var bs = note_blocks()
-    bs.num_blocks = 0;
-    
-    blocks_init(&bs)
-
-    switch content {
-    case .content(let s, let tags):
-        return s.withCString { cptr in
-            damus_parse_content(&bs, cptr)
-            return parsed_blocks_finish(bs: &bs, tags: tags)
-        }
-    case .note(let note):
-        damus_parse_content(&bs, note.content_raw)
-        return parsed_blocks_finish(bs: &bs, tags: note.tags)
-    }
-}
-
 func interpret_event_refs(tags: TagsSequence) -> ThreadReply? {
     // migration is long over, lets just do this to fix tests
     return interpret_event_refs_ndb(tags: tags)

damus/Core/Nostr/Mentions.swift

@@ -27,6 +27,10 @@ extension UnsafePointer<UInt8> {
 struct MentionRef: TagKeys, TagConvertible, Equatable, Hashable {
     let nip19: Bech32Object
     
+    static func pubkey(_ pubkey: Pubkey) -> MentionRef {
+        self.init(nip19: .npub(pubkey))
+    }
+
     static func note(_ note_id: NoteId) -> MentionRef {
         return self.init(nip19: .note(note_id))
     }
@@ -215,7 +219,7 @@ struct LightningInvoice<T> {
         // avoiding code duplication and utilizing the guarantees acquired from age and testing.
         // We could also use the C function `parse_invoice`, but it requires extra C bridging logic.
         // NDBTODO: This may need updating on the nostrdb upgrade.
-        let parsedBlocks = parse_note_content(content: .content(string,nil)).blocks
+        guard let parsedBlocks = parse_note_content(content: .content(string,nil))?.blocks else { return nil }
         guard parsedBlocks.count == 1 else { return nil }
         return parsedBlocks[0].asInvoice
     }
@@ -350,14 +354,3 @@ func make_post_tags(post_blocks: [Block], tags: [[String]]) -> PostTags {
     return PostTags(blocks: post_blocks, tags: new_tags)
 }
 
-func post_to_event(post: NostrPost, keypair: FullKeypair) -> NostrEvent? {
-    let tags = post.references.map({ r in r.tag }) + post.tags
-    guard let post_blocks = parse_post_blocks(content: post.content)?.blocks else {
-        return nil
-    }
-    let post_tags = make_post_tags(post_blocks: post_blocks, tags: tags)
-    let content = post_tags.blocks
-        .map({ b in b.asString })
-        .joined(separator: "")
-    return NostrEvent(content: content, keypair: keypair.to_keypair(), kind: post.kind.rawValue, tags: post_tags.tags)
-}

damus/Core/Nostr/NostrEvent.swift

@@ -518,6 +518,15 @@ func uniq<T: Hashable>(_ xs: [T]) -> [T] {
     return ys
 }
 
+func gather_quote_ids(our_pubkey: Pubkey, from: NostrEvent) -> [RefId] {
+    var ids: [RefId] = [.quote(from.id.quote_id)]
+    if from.pubkey != our_pubkey {
+        ids.append(.pubkey(from.pubkey))
+    }
+    return ids
+}
+
+
 func gather_reply_ids(our_pubkey: Pubkey, from: NostrEvent) -> [RefId] {
     var ids: [RefId] = from.referenced_ids.first.map({ ref in [ .event(ref) ] }) ?? []
 
@@ -538,14 +547,6 @@ func gather_reply_ids(our_pubkey: Pubkey, from: NostrEvent) -> [RefId] {
     return ids
 }
 
-func gather_quote_ids(our_pubkey: Pubkey, from: NostrEvent) -> [RefId] {
-    var ids: [RefId] = [.quote(from.id.quote_id)]
-    if from.pubkey != our_pubkey {
-        ids.append(.pubkey(from.pubkey))
-    }
-    return ids
-}
-
 func event_from_json(dat: String) -> NostrEvent? {
     return NostrEvent.owned_from_json(json: dat)
 }