test: fix broken tests

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

nostrdb/Ndb.swift

@@ -111,7 +111,8 @@ class Ndb {
             var ok = false
             while !ok && mapsize > 1024 * 1024 * 700 {
                 var cfg = ndb_config(flags: 0, ingester_threads: ingest_threads, mapsize: mapsize, filter_context: nil, ingest_filter: nil, sub_cb_ctx: nil, sub_cb: nil)
-                ok = ndb_init(&ndb_p, testdir, &cfg) != 0
+                let res = ndb_init(&ndb_p, testdir, &cfg);
+                let ok = res != 0;
                 if !ok {
                     Log.error("ndb_init failed: %d, reducing mapsize from %d to %d", for: .storage, res, mapsize, mapsize / 2)
                     mapsize /= 2

nostrdb/block.h

@@ -8,50 +8,4 @@
 #ifndef block_h
 #define block_h
 
-#include "nostr_bech32.h"
-#include "str_block.h"
-
-#define MAX_BLOCKS 1024
-
-enum block_type {
-    BLOCK_HASHTAG = 1,
-    BLOCK_TEXT = 2,
-    BLOCK_MENTION_INDEX = 3,
-    BLOCK_MENTION_BECH32 = 4,
-    BLOCK_URL = 5,
-    BLOCK_INVOICE = 6,
-};
-
-
-typedef struct invoice_block {
-    struct str_block invstr;
-    union {
-        struct bolt11 *bolt11;
-    };
-} invoice_block_t;
-
-typedef struct mention_bech32_block {
-    struct str_block str;
-    struct nostr_bech32 bech32;
-} mention_bech32_block_t;
-
-typedef struct note_block {
-    enum block_type type;
-    union {
-        struct str_block str;
-        struct invoice_block invoice;
-        struct mention_bech32_block mention_bech32;
-        int mention_index;
-    } block;
-} block_t;
-
-typedef struct note_blocks {
-    int words;
-    int num_blocks;
-    struct note_block *blocks;
-} blocks_t;
-
-void blocks_init(struct note_blocks *blocks);
-void blocks_free(struct note_blocks *blocks);
-
 #endif /* block_h */

nostrdb/ccan/ccan/crypto/sha256/sha256.c

@@ -162,7 +162,7 @@ static void Transform(uint32_t *s, const uint32_t *chunk)
 	s[2] += c;
 	s[3] += d;
 	s[4] += e;
-	s[5] nostrdb: += f;
+	s[5] += f;
 	s[6] += g;
 	s[7] += h;
 }

nostrdb/str_block.h

@@ -8,9 +8,4 @@
 #ifndef str_block_h
 #define str_block_h
 
-typedef struct str_block {
-    const char *start;
-    const char *end;
-} str_block_t;
-
 #endif /* str_block_h */