From 55917e09b186c44afc53fc0dd2d3635b34febcd8 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 19 May 2026 14:34:12 +0530 Subject: 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 --- main/config.h | 2 -- tests/unit/Makefile | 2 +- tests/unit/stubs/market.h | 21 +++++++++++++++++++++ tests/unit/test_beacon_price | Bin 34808 -> 35744 bytes tests/unit/test_cvm_server | Bin 45720 -> 45712 bytes tests/unit/test_firewall_sandbox | Bin 30576 -> 30568 bytes tests/unit/test_geohash | Bin 20784 -> 20776 bytes tests/unit/test_identity | Bin 297888 -> 297872 bytes tests/unit/test_lightning_payout | Bin 20552 -> 20552 bytes tests/unit/test_lnurl_pay | Bin 21312 -> 21304 bytes tests/unit/test_market | Bin 48240 -> 49456 bytes tests/unit/test_mcp_handler | Bin 64152 -> 64496 bytes tests/unit/test_mining_payment | Bin 28672 -> 28664 bytes tests/unit/test_nip04 | Bin 298784 -> 298776 bytes tests/unit/test_session_payment_method | Bin 54008 -> 54680 bytes tests/unit/test_stratum_proxy | Bin 40752 -> 40744 bytes tests/unit/test_tollgate_client | Bin 52968 -> 73336 bytes tests/unit/test_tollgate_client_mining | Bin 47224 -> 48448 bytes tests/unit/test_tollgate_client_mining.c | 8 ++++++++ 19 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 tests/unit/stubs/market.h 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 +#include + +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 Binary files a/tests/unit/test_beacon_price and b/tests/unit/test_beacon_price differ diff --git a/tests/unit/test_cvm_server b/tests/unit/test_cvm_server index bd5e735..ea327b7 100755 Binary files a/tests/unit/test_cvm_server and b/tests/unit/test_cvm_server differ diff --git a/tests/unit/test_firewall_sandbox b/tests/unit/test_firewall_sandbox index 4b85357..3e2895b 100755 Binary files a/tests/unit/test_firewall_sandbox and b/tests/unit/test_firewall_sandbox differ diff --git a/tests/unit/test_geohash b/tests/unit/test_geohash index 46d0e6f..dc5045f 100755 Binary files a/tests/unit/test_geohash and b/tests/unit/test_geohash differ diff --git a/tests/unit/test_identity b/tests/unit/test_identity index d0ff402..aa5e359 100755 Binary files a/tests/unit/test_identity and b/tests/unit/test_identity differ diff --git a/tests/unit/test_lightning_payout b/tests/unit/test_lightning_payout index caa9626..b10888c 100755 Binary files a/tests/unit/test_lightning_payout and b/tests/unit/test_lightning_payout differ diff --git a/tests/unit/test_lnurl_pay b/tests/unit/test_lnurl_pay index 1345004..1f16293 100755 Binary files a/tests/unit/test_lnurl_pay and b/tests/unit/test_lnurl_pay differ diff --git a/tests/unit/test_market b/tests/unit/test_market index 9823080..a386530 100755 Binary files a/tests/unit/test_market and b/tests/unit/test_market differ diff --git a/tests/unit/test_mcp_handler b/tests/unit/test_mcp_handler index be992f6..e98f2c3 100755 Binary files a/tests/unit/test_mcp_handler and b/tests/unit/test_mcp_handler differ diff --git a/tests/unit/test_mining_payment b/tests/unit/test_mining_payment index 015deaf..36d80d3 100755 Binary files a/tests/unit/test_mining_payment and b/tests/unit/test_mining_payment differ diff --git a/tests/unit/test_nip04 b/tests/unit/test_nip04 index daf5e16..cb52040 100755 Binary files a/tests/unit/test_nip04 and b/tests/unit/test_nip04 differ diff --git a/tests/unit/test_session_payment_method b/tests/unit/test_session_payment_method index 94c7134..b66a9d7 100755 Binary files a/tests/unit/test_session_payment_method and b/tests/unit/test_session_payment_method differ diff --git a/tests/unit/test_stratum_proxy b/tests/unit/test_stratum_proxy index 608835f..de88ff6 100755 Binary files a/tests/unit/test_stratum_proxy and b/tests/unit/test_stratum_proxy differ diff --git a/tests/unit/test_tollgate_client b/tests/unit/test_tollgate_client index b56a6f0..8e451c4 100755 Binary files a/tests/unit/test_tollgate_client and b/tests/unit/test_tollgate_client differ diff --git a/tests/unit/test_tollgate_client_mining b/tests/unit/test_tollgate_client_mining index 64b99dd..1aead58 100755 Binary files a/tests/unit/test_tollgate_client_mining and b/tests/unit/test_tollgate_client_mining differ 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" -- cgit v1.2.3