fix: resolve merge conflicts + test build fixes

- config.h: remove duplicate nostr_sync fields
- Makefile: add mint_health stub for test_session_payment_method
- test_tollgate_client_mining: inline market_t stub to avoid dependency cascade
- CMakeLists: add negentropy_adapter.c + esp_littlefs + negentropy REQUIRES

19 files changed, 30 insertions, 3 deletions

diff --git a/main/config.h b/main/config.h
index 9463845..50f7efb 100644
--- a/main/config.h
+++ b/main/config.h
@@ -81,8 +81,6 @@ typedef struct {
 
     char nostr_seed_relays[TOLLGATE_MAX_SEED_RELAYS][128];
     int nostr_seed_relay_count;
-    int nostr_sync_interval_s;
-    int nostr_fallback_sync_interval_s;
 
     bool market_enabled;
     int market_scan_interval_s;
diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index edff73c..b0b6922 100644
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -97,7 +97,7 @@ test_stratum_proxy: test_stratum_proxy.c $(REPO_ROOT)/main/stratum_proxy.c $(REP
         $(CC) $(CFLAGS) $< $(REPO_ROOT)/main/stratum_proxy.c $(REPO_ROOT)/main/mining_payment.c -o $@ $(LDFLAGS)
 
 test_session_payment_method: test_session_payment_method.c $(REPO_ROOT)/main/session.c $(REPO_ROOT)/main/cashu.c
-        $(CC) $(CFLAGS) $< $(REPO_ROOT)/main/session.c $(REPO_ROOT)/main/cashu.c -o $@ $(LDFLAGS)
+        $(CC) $(CFLAGS) -include stubs/mint_health.h $< $(REPO_ROOT)/main/session.c $(REPO_ROOT)/main/cashu.c -o $@ $(LDFLAGS)
 
 test_tollgate_client_mining: test_tollgate_client_mining.c
         $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
diff --git a/tests/unit/stubs/market.h b/tests/unit/stubs/market.h
new file mode 100644
index 0000000..b81564d
--- /dev/null
+++ b/tests/unit/stubs/market.h
@@ -0,0 +1,21 @@
+#ifndef STUBS_MARKET_H
+#define STUBS_MARKET_H
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef struct {
+    uint8_t bssid[6];
+    int8_t rssi;
+    uint16_t price_per_step;
+    uint32_t step_size;
+    uint8_t metric;
+    uint8_t mint_hash[4];
+    uint8_t npub_hash[4];
+    int64_t discovered_ms;
+} market_t;
+
+static inline const market_t *market_get(void) { return NULL; }
+static inline int market_find_cheapest(void) { return -1; }
+
+#endif
diff --git a/tests/unit/test_beacon_price b/tests/unit/test_beacon_price
index 47efd2b..a9f6357 100755
--- a/tests/unit/test_beacon_price
+++ b/tests/unit/test_beacon_price
diff --git a/tests/unit/test_cvm_server b/tests/unit/test_cvm_server
index bd5e735..ea327b7 100755
--- a/tests/unit/test_cvm_server
+++ b/tests/unit/test_cvm_server
diff --git a/tests/unit/test_firewall_sandbox b/tests/unit/test_firewall_sandbox
index 4b85357..3e2895b 100755
--- a/tests/unit/test_firewall_sandbox
+++ b/tests/unit/test_firewall_sandbox
diff --git a/tests/unit/test_geohash b/tests/unit/test_geohash
index 46d0e6f..dc5045f 100755
--- a/tests/unit/test_geohash
+++ b/tests/unit/test_geohash
diff --git a/tests/unit/test_identity b/tests/unit/test_identity
index d0ff402..aa5e359 100755
--- a/tests/unit/test_identity
+++ b/tests/unit/test_identity
diff --git a/tests/unit/test_lightning_payout b/tests/unit/test_lightning_payout
index caa9626..b10888c 100755
--- a/tests/unit/test_lightning_payout
+++ b/tests/unit/test_lightning_payout
diff --git a/tests/unit/test_lnurl_pay b/tests/unit/test_lnurl_pay
index 1345004..1f16293 100755
--- a/tests/unit/test_lnurl_pay
+++ b/tests/unit/test_lnurl_pay
diff --git a/tests/unit/test_market b/tests/unit/test_market
index 9823080..a386530 100755
--- a/tests/unit/test_market
+++ b/tests/unit/test_market
diff --git a/tests/unit/test_mcp_handler b/tests/unit/test_mcp_handler
index be992f6..e98f2c3 100755
--- a/tests/unit/test_mcp_handler
+++ b/tests/unit/test_mcp_handler
diff --git a/tests/unit/test_mining_payment b/tests/unit/test_mining_payment
index 015deaf..36d80d3 100755
--- a/tests/unit/test_mining_payment
+++ b/tests/unit/test_mining_payment
diff --git a/tests/unit/test_nip04 b/tests/unit/test_nip04
index daf5e16..cb52040 100755
--- a/tests/unit/test_nip04
+++ b/tests/unit/test_nip04
diff --git a/tests/unit/test_session_payment_method b/tests/unit/test_session_payment_method
index 94c7134..b66a9d7 100755
--- a/tests/unit/test_session_payment_method
+++ b/tests/unit/test_session_payment_method
diff --git a/tests/unit/test_stratum_proxy b/tests/unit/test_stratum_proxy
index 608835f..de88ff6 100755
--- a/tests/unit/test_stratum_proxy
+++ b/tests/unit/test_stratum_proxy
diff --git a/tests/unit/test_tollgate_client b/tests/unit/test_tollgate_client
index b56a6f0..8e451c4 100755
--- a/tests/unit/test_tollgate_client
+++ b/tests/unit/test_tollgate_client
diff --git a/tests/unit/test_tollgate_client_mining b/tests/unit/test_tollgate_client_mining
index 64b99dd..1aead58 100755
--- a/tests/unit/test_tollgate_client_mining
+++ b/tests/unit/test_tollgate_client_mining
diff --git a/tests/unit/test_tollgate_client_mining.c b/tests/unit/test_tollgate_client_mining.c
index e270864..efe543e 100644
--- a/tests/unit/test_tollgate_client_mining.c
+++ b/tests/unit/test_tollgate_client_mining.c
@@ -14,6 +14,14 @@ const tollgate_config_t *tollgate_config_get(void) {
 uint64_t nucula_wallet_balance(void) { return 100; }
 esp_err_t nucula_wallet_send(uint64_t a, char *b, size_t c) { (void)a; (void)b; (void)c; return ESP_OK; }
 
+#define TOLLGATE_IE_GEOHASH_MAX 9
+#define MARKET_MAX_ENTRIES 10
+typedef struct { uint8_t bssid[6]; char ssid[33]; int8_t rssi; uint16_t price_per_step; uint32_t step_size; uint8_t metric; uint8_t mint_hash[4]; uint8_t npub_hash[4]; char geohash[10]; int64_t discovered_ms; bool valid; } market_entry_t;
+typedef struct { market_entry_t entries[MARKET_MAX_ENTRIES]; int count; int64_t last_scan_ms; bool scanning; int consecutive_failures; } market_t;
+static inline const market_t *market_get(void) { static market_t m = {0}; return &m; }
+static inline int market_find_cheapest(void) { return -1; }
+#define MARKET_H
+
 #include "freertos/FreeRTOS.h"
 
 #include "../../main/tollgate_client.c"