Phase 7: eliminate shims - consumer files use component headers directly

- Deleted standalone shims: session.c/h, cashu.c/h, mining_payment.c/h, firewall.c/h
- Updated captive_portal.c, tollgate_api.c, tollgate_main.c, mcp_handler.c,
  cvm_server.c, sw_miner.c, stratum_client.c to include component headers
- Moved tollgate_ip4_canforward_filter() lwIP hook into tollgate_main.c
- Fixed all unit tests to use component API (test_cashu, test_session,
  test_mining_payment, test_stratum_proxy, test_session_payment_method,
  test_firewall_sandbox, test_mcp_handler)
- Removed deleted source files from Makefile targets
- All 21 unit tests pass, ESP-IDF build passes

12 files changed, 179 insertions, 224 deletions

diff --git a/tests/unit/Makefile b/tests/unit/Makefile
index 5fdc315..3890243 100644
--- a/tests/unit/Makefile
+++ b/tests/unit/Makefile
@@ -61,12 +61,12 @@ test_identity: test_identity.c $(REPO_ROOT)/main/identity.c $(SECP256K1_OBJ)
 test_nostr_event: test_nostr_event.c $(REPO_ROOT)/main/nostr_event.c $(REPO_ROOT)/main/identity.c $(SECP256K1_OBJ)
         $(CC) $(CFLAGS) -I $(SECP256K1_PRIV_INC) $< $(REPO_ROOT)/main/nostr_event.c $(REPO_ROOT)/main/identity.c $(SECP256K1_OBJ) -o $@ $(LDFLAGS)
 
-test_cashu: test_cashu.c $(REPO_ROOT)/main/cashu.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
+test_cashu: test_cashu.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
         $(CC) $(CFLAGS) -include stubs/mint_health.h -include stubs/esp_netif.h -include stubs/esp_log.h -include stubs/esp_http_client.h -include stubs/esp_crt_bundle.h $^ -o $@ $(LDFLAGS)
 
 TG_CORE_OBJS_CFLAGS := -include stubs/mint_health.h -include stubs/esp_netif.h -include stubs/esp_log.h -include stubs/esp_http_client.h -include stubs/esp_crt_bundle.h -include stubs/esp_crt_bundle.h
 
-test_session: test_session.c $(REPO_ROOT)/main/session.c $(REPO_ROOT)/main/cashu.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
+test_session: test_session.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
         $(CC) $(CFLAGS) $(TG_CORE_OBJS_CFLAGS) $^ -o $@ $(LDFLAGS)
 
 test_tollgate_client: test_tollgate_client.c $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c
@@ -79,7 +79,7 @@ test_lightning_payout: test_lightning_payout.c
         $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
 
 test_mcp_handler: test_mcp_handler.c $(REPO_ROOT)/main/mcp_handler.c
-        $(CC) $(CFLAGS) -I $(REPO_ROOT)/main $< $(REPO_ROOT)/main/mcp_handler.c -o $@ $(LDFLAGS)
+        $(CC) $(CFLAGS) -I $(REPO_ROOT)/main -I $(TG_CORE_INC) -I $(TG_CORE_INC)/.. $< $(REPO_ROOT)/main/mcp_handler.c -o $@ $(LDFLAGS)
 
 test_nip04: test_nip04.c $(REPO_ROOT)/main/nip04.c $(SECP256K1_OBJ)
         $(CC) $(CFLAGS) -I $(SECP256K1_PRIV_INC) $< $(REPO_ROOT)/main/nip04.c $(SECP256K1_OBJ) -o $@ $(LDFLAGS)
@@ -96,19 +96,19 @@ test_beacon_price: test_beacon_price.c $(REPO_ROOT)/main/beacon_price.c
 test_market: test_market.c $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c
         $(CC) $(CFLAGS) -I $(REPO_ROOT)/main $< $(REPO_ROOT)/main/market.c $(REPO_ROOT)/main/beacon_price.c -o $@ $(LDFLAGS)
 
-test_mining_payment: test_mining_payment.c $(REPO_ROOT)/main/mining_payment.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
+test_mining_payment: test_mining_payment.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
         $(CC) $(CFLAGS) $(TG_CORE_OBJS_CFLAGS) $^ -o $@ $(LDFLAGS)
 
-test_stratum_proxy: test_stratum_proxy.c $(REPO_ROOT)/main/stratum_proxy.c $(REPO_ROOT)/main/mining_payment.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
-        $(CC) $(CFLAGS) $(TG_CORE_OBJS_CFLAGS) $^ -o $@ $(LDFLAGS)
+test_stratum_proxy: test_stratum_proxy.c $(REPO_ROOT)/main/stratum_proxy.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
+        $(CC) $(CFLAGS) -I $(REPO_ROOT)/main $(TG_CORE_OBJS_CFLAGS) $^ -o $@ $(LDFLAGS)
 
-test_session_payment_method: test_session_payment_method.c $(REPO_ROOT)/main/session.c $(REPO_ROOT)/main/cashu.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
+test_session_payment_method: test_session_payment_method.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
         $(CC) $(CFLAGS) $(TG_CORE_OBJS_CFLAGS) $^ -o $@ $(LDFLAGS)
 
 test_tollgate_client_mining: test_tollgate_client_mining.c
         $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
 
-test_firewall_sandbox: test_firewall_sandbox.c $(REPO_ROOT)/main/firewall.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
+test_firewall_sandbox: test_firewall_sandbox.c $(TG_CORE_SRC)/tollgate_core_firewall.c $(TG_CORE_SRC)/tollgate_core.c $(TG_CORE_SRC)/tollgate_core_session.c $(TG_CORE_SRC)/tollgate_core_cashu.c $(TG_CORE_SRC)/tollgate_core_mining.c $(TG_CORE_SRC)/tollgate_core_dns.c $(TG_CORE_SRC)/tollgate_core_stratum_proxy.c
         $(CC) $(CFLAGS) -include stubs/dns_server.h $(TG_CORE_OBJS_CFLAGS) $^ -o $@ $(LDFLAGS)
 
 test_relay_selector: test_relay_selector.c
diff --git a/tests/unit/test_cashu.c b/tests/unit/test_cashu.c
index 021d1b7..2b86a34 100644
--- a/tests/unit/test_cashu.c
+++ b/tests/unit/test_cashu.c
@@ -1,5 +1,5 @@
 #include "test_framework.h"
-#include "../../main/cashu.h"
+#include "tollgate_core_cashu.h"
 #include "../../main/config.h"
 #include <string.h>
 #include <stdio.h>
@@ -32,38 +32,38 @@ int main(void)
     }
     g_test_config.accepted_mint_count = 4;
 
-    printf("\n--- cashu_calculate_allotment_ms ---\n");
-    uint64_t a1 = cashu_calculate_allotment_ms(21, 21, 60000);
+    printf("\n--- tollgate_core_cashu_calculate_allotment ---\n");
+    uint64_t a1 = tollgate_core_cashu_calculate_allotment(21, 21, 60000);
     ASSERT_EQ_INT(60000, (int)a1, "21 sats at 21 sats/min = 60000ms");
 
-    uint64_t a2 = cashu_calculate_allotment_ms(42, 21, 60000);
+    uint64_t a2 = tollgate_core_cashu_calculate_allotment(42, 21, 60000);
     ASSERT_EQ_INT(120000, (int)a2, "42 sats at 21 sats/min = 120000ms");
 
-    uint64_t a3 = cashu_calculate_allotment_ms(1, 21, 60000);
+    uint64_t a3 = tollgate_core_cashu_calculate_allotment(1, 21, 60000);
     ASSERT_EQ_INT(0, (int)a3, "1 sat at 21 sats/min = 0ms (rounds down)");
 
-    uint64_t a4 = cashu_calculate_allotment_ms(100, 10, 30000);
+    uint64_t a4 = tollgate_core_cashu_calculate_allotment(100, 10, 30000);
     ASSERT_EQ_INT(300000, (int)a4, "100 sats at 10 sats/30s = 300000ms");
 
-    printf("\n--- cashu_is_mint_accepted (multi-mint) ---\n");
-    ASSERT(cashu_is_mint_accepted("https://testnut.cashu.space"), "testnut.cashu.space accepted");
-    ASSERT(cashu_is_mint_accepted("https://mint.minibits.cash/Bitcoin"), "minibits accepted");
-    ASSERT(cashu_is_mint_accepted("https://mint.coinos.io"), "coinos accepted");
-    ASSERT(cashu_is_mint_accepted("https://21mint.me"), "21mint accepted");
-    ASSERT(!cashu_is_mint_accepted("https://evil.mint.example.com"), "evil mint rejected");
-    ASSERT(!cashu_is_mint_accepted(""), "empty string rejected");
-    ASSERT(!cashu_is_mint_accepted(NULL), "NULL rejected");
+    printf("\n--- tollgate_core_cashu_is_mint_accepted (multi-mint) ---\n");
+    ASSERT(tollgate_core_cashu_is_mint_accepted("https://testnut.cashu.space", "https://testnut.cashu.space"), "testnut.cashu.space accepted");
+    ASSERT(tollgate_core_cashu_is_mint_accepted("https://mint.minibits.cash/Bitcoin", "https://mint.minibits.cash/Bitcoin"), "minibits accepted");
+    ASSERT(tollgate_core_cashu_is_mint_accepted("https://mint.coinos.io", "https://mint.coinos.io"), "coinos accepted");
+    ASSERT(tollgate_core_cashu_is_mint_accepted("https://21mint.me", "https://21mint.me"), "21mint accepted");
+    ASSERT(!tollgate_core_cashu_is_mint_accepted("https://evil.mint.example.com", "https://testnut.cashu.space"), "evil mint rejected");
+    ASSERT(!tollgate_core_cashu_is_mint_accepted("", "https://testnut.cashu.space"), "empty string rejected");
+    ASSERT(!tollgate_core_cashu_is_mint_accepted(NULL, "https://testnut.cashu.space"), "NULL rejected");
 
-    printf("\n--- cashu_decode_token with garbage ---\n");
-    cashu_token_t token;
+    printf("\n--- tollgate_core_cashu_decode_token with garbage ---\n");
+    tg_cashu_token_t token;
     memset(&token, 0, sizeof(token));
-    esp_err_t ret = cashu_decode_token("garbage", &token);
+    esp_err_t ret = tollgate_core_cashu_decode_token("garbage", &token);
     ASSERT(ret != ESP_OK, "Garbage input returns error");
 
-    ret = cashu_decode_token("", &token);
+    ret = tollgate_core_cashu_decode_token("", &token);
     ASSERT(ret != ESP_OK, "Empty string returns error");
 
-    ret = cashu_decode_token("cashuA!!invalid-base64!!", &token);
+    ret = tollgate_core_cashu_decode_token("cashuA!!invalid-base64!!", &token);
     ASSERT(ret != ESP_OK, "Invalid base64url returns error");
 
     TEST_SUMMARY();
diff --git a/tests/unit/test_firewall_sandbox b/tests/unit/test_firewall_sandbox
index 0c3aa59..9da996d 100755
--- a/tests/unit/test_firewall_sandbox
+++ b/tests/unit/test_firewall_sandbox
diff --git a/tests/unit/test_firewall_sandbox.c b/tests/unit/test_firewall_sandbox.c
index 66a491b..14025ac 100644
--- a/tests/unit/test_firewall_sandbox.c
+++ b/tests/unit/test_firewall_sandbox.c
@@ -1,5 +1,6 @@
 #include "test_framework.h"
-#include "../../main/firewall.h"
+#include "tollgate_core_firewall.h"
+#include "tollgate_core.h"
 #include <stdio.h>
 #include <string.h>
 
@@ -7,9 +8,9 @@ int main(void)
 {
     printf("=== test_firewall_sandbox ===\n");
 
-    printf("\n--- FW_MAX_MAC_LEN is 18 ---\n");
+    printf("\n--- TG_FW_MAX_MAC_LEN is 18 ---\n");
     {
-        ASSERT_EQ_INT(18, FW_MAX_MAC_LEN, "MAC length is 18 (17 chars + null)");
+        ASSERT_EQ_INT(18, TG_FW_MAX_MAC_LEN, "MAC length is 18 (17 chars + null)");
     }
 
     printf("\n--- esp_ip4_addr_t available ---\n");
@@ -19,75 +20,75 @@ int main(void)
         ASSERT(ip.addr == 0x0102A8C0, "ip4_addr stores value");
     }
 
-    printf("\n--- firewall_set_mining_port / set_sandbox_mint_access compile ---\n");
+    printf("\n--- tollgate_core_fw_set_sandbox_ports / set_sandbox_mint_access compile ---\n");
     {
-        firewall_set_mining_port(3333);
-        firewall_set_mining_port(4033);
-        firewall_set_sandbox_mint_access(true);
-        firewall_set_sandbox_mint_access(false);
+        tollgate_core_fw_set_sandbox_ports(3333);
+        tollgate_core_fw_set_sandbox_ports(4033);
+        tollgate_core_fw_set_sandbox_mint_access(true);
+        tollgate_core_fw_set_sandbox_mint_access(false);
         ASSERT(true, "setters compile and run without crash");
     }
 
-    printf("\n--- firewall_init + client management ---\n");
+    printf("\n--- tollgate_core_fw_init + client management ---\n");
     {
         esp_ip4_addr_t ap_ip = { .addr = 0x012FA80A };
-        esp_err_t ret = firewall_init(ap_ip);
-        ASSERT_EQ_INT(ESP_OK, (int)ret, "firewall_init succeeds");
-        ASSERT_EQ_INT(0, firewall_client_count(), "no clients after init");
+        esp_err_t ret = tollgate_core_fw_init(ap_ip);
+        ASSERT_EQ_INT(ESP_OK, (int)ret, "tollgate_core_fw_init succeeds");
+        ASSERT_EQ_INT(0, tollgate_core_fw_client_count(), "no clients after init");
 
-        firewall_grant_access(0x0201A8C0);
-        ASSERT_EQ_INT(1, firewall_client_count(), "1 client after grant");
-        ASSERT(firewall_is_client_allowed(0x0201A8C0), "client is allowed");
+        tollgate_core_fw_grant(0x0201A8C0);
+        ASSERT_EQ_INT(1, tollgate_core_fw_client_count(), "1 client after grant");
+        ASSERT(tollgate_core_fw_is_allowed(0x0201A8C0), "client is allowed");
 
-        firewall_revoke_access(0x0201A8C0);
-        ASSERT_EQ_INT(0, firewall_client_count(), "0 clients after revoke");
-        ASSERT(!firewall_is_client_allowed(0x0201A8C0), "client not allowed after revoke");
+        tollgate_core_fw_revoke(0x0201A8C0);
+        ASSERT_EQ_INT(0, tollgate_core_fw_client_count(), "0 clients after revoke");
+        ASSERT(!tollgate_core_fw_is_allowed(0x0201A8C0), "client not allowed after revoke");
     }
 
     printf("\n--- grant same IP twice ---\n");
     {
         esp_ip4_addr_t ap_ip = { .addr = 0x012FA80A };
-        firewall_init(ap_ip);
+        tollgate_core_fw_init(ap_ip);
 
-        firewall_grant_access(0x0301A8C0);
-        firewall_grant_access(0x0301A8C0);
-        ASSERT_EQ_INT(1, firewall_client_count(), "duplicate grant does not double count");
+        tollgate_core_fw_grant(0x0301A8C0);
+        tollgate_core_fw_grant(0x0301A8C0);
+        ASSERT_EQ_INT(1, tollgate_core_fw_client_count(), "duplicate grant does not double count");
     }
 
     printf("\n--- revoke non-existent ---\n");
     {
-        firewall_revoke_access(0x99999999);
-        ASSERT_EQ_INT(1, firewall_client_count(), "revoke non-existent no effect");
+        tollgate_core_fw_revoke(0x99999999);
+        ASSERT_EQ_INT(1, tollgate_core_fw_client_count(), "revoke non-existent no effect");
     }
 
     printf("\n--- revoke_all ---\n");
     {
-        firewall_grant_access(0x0401A8C0);
-        firewall_grant_access(0x0501A8C0);
-        ASSERT_EQ_INT(3, firewall_client_count(), "3 clients");
-        firewall_revoke_all();
-        ASSERT_EQ_INT(0, firewall_client_count(), "0 after revoke_all");
+        tollgate_core_fw_grant(0x0401A8C0);
+        tollgate_core_fw_grant(0x0501A8C0);
+        ASSERT_EQ_INT(3, tollgate_core_fw_client_count(), "3 clients");
+        tollgate_core_fw_revoke_all();
+        ASSERT_EQ_INT(0, tollgate_core_fw_client_count(), "0 after revoke_all");
     }
 
     printf("\n--- max clients (10) ---\n");
     {
         esp_ip4_addr_t ap_ip = { .addr = 0x012FA80A };
-        firewall_init(ap_ip);
+        tollgate_core_fw_init(ap_ip);
 
         for (int i = 0; i < 10; i++) {
-            firewall_grant_access(0x0A000000 + i);
+            tollgate_core_fw_grant(0x0A000000 + i);
         }
-        ASSERT_EQ_INT(10, firewall_client_count(), "10 clients at max");
+        ASSERT_EQ_INT(10, tollgate_core_fw_client_count(), "10 clients at max");
 
-        firewall_grant_access(0x0A000100);
-        ASSERT_EQ_INT(10, firewall_client_count(), "still 10 after exceeding max");
+        tollgate_core_fw_grant(0x0A000100);
+        ASSERT_EQ_INT(10, tollgate_core_fw_client_count(), "still 10 after exceeding max");
     }
 
     printf("\n--- is_mac_allowed (no MACs resolved in stub) ---\n");
     {
-        firewall_init((esp_ip4_addr_t){ .addr = 0x012FA80A });
-        firewall_grant_access(0x0601A8C0);
-        ASSERT(!firewall_is_mac_allowed(""), "empty MAC not allowed");
+        tollgate_core_fw_init((esp_ip4_addr_t){ .addr = 0x012FA80A });
+        tollgate_core_fw_grant(0x0601A8C0);
+        ASSERT(!tollgate_core_fw_is_mac_allowed(""), "empty MAC not allowed");
     }
 
     TEST_SUMMARY();
diff --git a/tests/unit/test_mcp_handler.c b/tests/unit/test_mcp_handler.c
index 05e9e38..61d1a8b 100644
--- a/tests/unit/test_mcp_handler.c
+++ b/tests/unit/test_mcp_handler.c
@@ -1,7 +1,8 @@
 #include "test_framework.h"
 #include "mcp_handler.h"
 #include "config.h"
-#include "session.h"
+#include "tollgate_core_session.h"
+#include "tollgate_core.h"
 #include "nucula_wallet.h"
 #include "cJSON.h"
 #include <string.h>
@@ -41,15 +42,15 @@ esp_err_t nucula_wallet_melt(const char *bolt11, uint64_t max_fee) {
     return g_wallet_melt_rc;
 }
 
-static session_t g_test_sessions[SESSION_MAX_CLIENTS];
+static tg_session_t g_test_sessions[TG_SESSION_MAX_CLIENTS];
 static int g_test_session_count = 0;
 
-session_t *cvm_get_sessions_array(void) {
+tg_session_t *tollgate_core_session_get_array(void) {
     return g_test_sessions;
 }
 
-int cvm_get_sessions_count(void) {
-    return SESSION_MAX_CLIENTS;
+int tollgate_core_session_get_array_size(void) {
+    return TG_SESSION_MAX_CLIENTS;
 }
 
 static void test_mcp_parse_tool(void)
diff --git a/tests/unit/test_mining_payment b/tests/unit/test_mining_payment
index dd4e781..d179de4 100755
--- a/tests/unit/test_mining_payment
+++ b/tests/unit/test_mining_payment
diff --git a/tests/unit/test_mining_payment.c b/tests/unit/test_mining_payment.c
index c3834fd..25932e5 100644
--- a/tests/unit/test_mining_payment.c
+++ b/tests/unit/test_mining_payment.c
@@ -1,5 +1,5 @@
 #include "test_framework.h"
-#include "../../main/mining_payment.h"
+#include "tollgate_core_mining.h"
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
@@ -8,84 +8,84 @@ int main(void)
 {
     printf("=== test_mining_payment ===\n");
 
-    mining_payment_init();
+    tollgate_core_mining_init();
 
-    printf("\n--- mining_nbits_to_difficulty ---\n");
-    uint64_t d1 = mining_nbits_to_difficulty(0);
+    printf("\n--- tollgate_core_mining_nbits_to_difficulty ---\n");
+    uint64_t d1 = tollgate_core_mining_nbits_to_difficulty(0);
     ASSERT(d1 == UINT64_MAX, "nbits=0 returns max");
 
-    uint64_t d2 = mining_nbits_to_difficulty(0x170309E2);
+    uint64_t d2 = tollgate_core_mining_nbits_to_difficulty(0x170309E2);
     ASSERT(d2 > 0, "mainnet nbits gives positive difficulty");
     printf("  INFO: difficulty for 0x170309E2 = %llu\n", (unsigned long long)d2);
 
-    uint64_t d3 = mining_nbits_to_difficulty(0x1d00ffff);
+    uint64_t d3 = tollgate_core_mining_nbits_to_difficulty(0x1d00ffff);
     ASSERT(d3 == 1, "pseudotransaction nbits = difficulty 1");
 
-    printf("\n--- mining_calculate_hashprice ---\n");
-    double hp1 = mining_calculate_hashprice(0);
+    printf("\n--- tollgate_core_mining_calc_hashprice ---\n");
+    double hp1 = tollgate_core_mining_calc_hashprice(0);
     ASSERT(hp1 == 0.0, "nbits=0 gives hashprice 0");
 
-    double hp2 = mining_calculate_hashprice(0x170309E2);
+    double hp2 = tollgate_core_mining_calc_hashprice(0x170309E2);
     ASSERT(hp2 > 0.0, "mainnet nbits gives positive hashprice");
     printf("  INFO: hashprice for 0x170309E2 = %.6f sat/GH/s/day\n", hp2);
 
-    printf("\n--- mining_calculate_hashprice_override ---\n");
-    double hp3 = mining_calculate_hashprice_override(1000);
+    printf("\n--- tollgate_core_mining_calc_hashprice_override ---\n");
+    double hp3 = tollgate_core_mining_calc_hashprice_override(1000);
     ASSERT(fabs(hp3 - 1000.0) < 0.001, "override returns exact value");
 
-    printf("\n--- mining_set_current_nbits ---\n");
-    mining_set_current_nbits(0x170309E2);
-    double hp4 = mining_get_current_hashprice();
+    printf("\n--- tollgate_core_mining_set_current_nbits ---\n");
+    tollgate_core_mining_set_current_nbits(0x170309E2);
+    double hp4 = tollgate_core_mining_get_current_hashprice();
     ASSERT(fabs(hp4 - hp2) < 0.0001, "stored hashprice matches calculated");
 
-    printf("\n--- mining_get_or_create_client ---\n");
-    mining_client_stats_t *c1 = mining_get_or_create_client(0x0A010203);
+    printf("\n--- tollgate_core_mining_get_or_create_client ---\n");
+    tollgate_mining_client_stats_t *c1 = tollgate_core_mining_get_or_create_client(0x0A010203);
     ASSERT(c1 != NULL, "created client 1");
     ASSERT(c1->ip == 0x0A010203, "client 1 IP matches");
     ASSERT(c1->shares_accepted == 0, "client 1 starts with 0 shares");
 
-    mining_client_stats_t *c2 = mining_get_or_create_client(0x0A010204);
+    tollgate_mining_client_stats_t *c2 = tollgate_core_mining_get_or_create_client(0x0A010204);
     ASSERT(c2 != NULL, "created client 2");
     ASSERT(c2->ip == 0x0A010204, "client 2 IP matches");
 
-    mining_client_stats_t *c1_again = mining_get_or_create_client(0x0A010203);
+    tollgate_mining_client_stats_t *c1_again = tollgate_core_mining_get_or_create_client(0x0A010203);
     ASSERT(c1_again == c1, "same IP returns same client");
 
-    printf("\n--- mining_update_hashrate ---\n");
-    mining_update_hashrate(0x0A010203, true);
-    mining_update_hashrate(0x0A010203, true);
-    mining_update_hashrate(0x0A010203, false);
+    printf("\n--- tollgate_core_mining_update_hashrate ---\n");
+    tollgate_core_mining_update_hashrate(0x0A010203, true);
+    tollgate_core_mining_update_hashrate(0x0A010203, true);
+    tollgate_core_mining_update_hashrate(0x0A010203, false);
 
-    const mining_client_stats_t *c1_stats = mining_get_client_stats(0x0A010203);
+    const tollgate_mining_client_stats_t *c1_stats = tollgate_core_mining_get_client_stats(0x0A010203);
     ASSERT(c1_stats != NULL, "client 1 stats found");
     ASSERT(c1_stats->shares_accepted == 2, "client 1 has 2 accepted");
     ASSERT(c1_stats->shares_rejected == 1, "client 1 has 1 rejected");
 
-    printf("\n--- mining_get_client_stats ---\n");
-    const mining_client_stats_t *notfound = mining_get_client_stats(0xFFFFFFFF);
+    printf("\n--- tollgate_core_mining_get_client_stats ---\n");
+    const tollgate_mining_client_stats_t *notfound = tollgate_core_mining_get_client_stats(0xFFFFFFFF);
     ASSERT(notfound == NULL, "nonexistent client returns NULL");
 
-    printf("\n--- mining_shares_to_allotment_ms ---\n");
-    uint64_t allot1 = mining_shares_to_allotment_ms(0.0, 100.0, 21, 60000);
+    printf("\n--- tollgate_core_mining_shares_to_allotment_ms ---\n");
+    uint64_t allot1 = tollgate_core_mining_shares_to_allotment_ms(0.0, 100.0, 21, 60000);
     ASSERT(allot1 == 0, "zero hashrate = zero allotment");
 
-    uint64_t allot2 = mining_shares_to_allotment_ms(1.0, 100.0, 21, 60000);
+    uint64_t allot2 = tollgate_core_mining_shares_to_allotment_ms(1.0, 100.0, 21, 60000);
     ASSERT(allot2 > 0, "positive hashrate gives positive allotment");
     printf("  INFO: 1 GH/s at 100 sat/GH/s/day, 21 sats/60s => %llu ms\n", (unsigned long long)allot2);
 
-    uint64_t allot3 = mining_shares_to_allotment_ms(10.0, 50.0, 10, 30000);
+    uint64_t allot3 = tollgate_core_mining_shares_to_allotment_ms(10.0, 50.0, 10, 30000);
     ASSERT(allot3 > 0, "10 GH/s at 50 sat gives positive allotment");
     printf("  INFO: 10 GH/s at 50 sat/GH/s/day, 10 sats/30s => %llu ms\n", (unsigned long long)allot3);
 
-    printf("\n--- mining_shares_to_allotment_bytes ---\n");
-    uint64_t ab1 = mining_shares_to_allotment_bytes(0.0, 100.0, 21, 1048576);
+    printf("\n--- tollgate_core_mining_shares_to_allotment_bytes ---\n");
+    uint64_t ab1 = tollgate_core_mining_shares_to_allotment_bytes(0.0, 100.0, 21, 1048576);
     ASSERT(ab1 == 0, "zero hashrate = zero bytes");
 
-    uint64_t ab2 = mining_shares_to_allotment_bytes(1.0, 100.0, 21, 1048576);
+    uint64_t ab2 = tollgate_core_mining_shares_to_allotment_bytes(1.0, 100.0, 21, 1048576);
     ASSERT(ab2 > 0, "positive hashrate gives positive bytes");
 
-    printf("\n--- mining_validate_share (stub) ---\n");
-    esp_err_t vr = mining_validate_share(NULL, 0, NULL, 0);
+    printf("\n--- tollgate_core_mining_validate_share (stub) ---\n");
+    esp_err_t vr = tollgate_core_mining_validate_share(NULL, 0, NULL, 0);
     ASSERT(vr == ESP_OK, "validate share stub returns OK");
 
     TEST_SUMMARY();
diff --git a/tests/unit/test_session.c b/tests/unit/test_session.c
index f83b9a6..69c1178 100644
--- a/tests/unit/test_session.c
+++ b/tests/unit/test_session.c
@@ -1,8 +1,9 @@
 #include "test_framework.h"
-#include "../../main/session.h"
-#include "../../main/firewall.h"
+#include "tollgate_core_session.h"
+#include "tollgate_core_firewall.h"
+#include "tollgate_core_cashu.h"
+#include "tollgate_core.h"
 #include "../../main/config.h"
-#include "../../main/cashu.h"
 #include <string.h>
 #include <stdio.h>
 
@@ -12,125 +13,96 @@ const tollgate_config_t *tollgate_config_get(void) {
     return &g_test_config;
 }
 
-static uint32_t g_granted_ips[32];
-static int g_granted_count = 0;
-static uint32_t g_revoked_ips[32];
-static int g_revoked_count = 0;
-
-esp_err_t firewall_get_mac_for_ip(uint32_t ip, char *mac_out, size_t size) {
-    (void)ip;
-    snprintf(mac_out, size, "AA:BB:CC:DD:EE:FF");
-    return 0;
-}
-
-void firewall_grant_access(uint32_t ip) {
-    if (g_granted_count < 32) g_granted_ips[g_granted_count++] = ip;
-}
-
-void firewall_revoke_access(uint32_t ip) {
-    if (g_revoked_count < 32) g_revoked_ips[g_revoked_count++] = ip;
-}
-
 static void test_sessions(void)
 {
     printf("=== test_session ===\n");
     memset(&g_test_config, 0, sizeof(g_test_config));
     strncpy(g_test_config.metric, "milliseconds", sizeof(g_test_config.metric) - 1);
 
-    g_granted_count = 0;
-    g_revoked_count = 0;
-
-    printf("\n--- session_manager_init ---\n");
-    esp_err_t ret = session_manager_init();
-    ASSERT_EQ_INT(0, ret, "session_manager_init succeeds");
-    ASSERT_EQ_INT(0, session_active_count(), "No sessions after init");
+    printf("\n--- tollgate_core_session_init ---\n");
+    esp_err_t ret = tollgate_core_session_init();
+    ASSERT_EQ_INT(0, ret, "tollgate_core_session_init succeeds");
+    ASSERT_EQ_INT(0, tollgate_core_session_active_count(), "No sessions after init");
 
-    printf("\n--- session_create ---\n");
-    session_t *s = session_create(0x0A01A8C0, 60000);
+    printf("\n--- tollgate_core_session_create ---\n");
+    tg_session_t *s = tollgate_core_session_create(0x0A01A8C0, 60000);
     ASSERT(s != NULL, "session_create returns non-NULL");
-    ASSERT_EQ_INT(1, session_active_count(), "1 session after create");
+    ASSERT_EQ_INT(1, tollgate_core_session_active_count(), "1 session after create");
 
-    printf("\n--- session_find_by_ip ---\n");
-    session_t *found = session_find_by_ip(0x0A01A8C0);
-    ASSERT(found == s, "session_find_by_ip returns the created session");
-    ASSERT(session_find_by_ip(0x01020304) == NULL, "session_find_by_ip returns NULL for unknown IP");
+    printf("\n--- tollgate_core_session_find_by_ip ---\n");
+    tg_session_t *found = tollgate_core_session_find_by_ip(0x0A01A8C0);
+    ASSERT(found == s, "tollgate_core_session_find_by_ip returns the created session");
+    ASSERT(tollgate_core_session_find_by_ip(0x01020304) == NULL, "tollgate_core_session_find_by_ip returns NULL for unknown IP");
 
-    printf("\n--- session_extend ---\n");
+    printf("\n--- tollgate_core_session_extend ---\n");
     uint64_t old_allotment = s->allotment_ms;
-    session_extend(s, 30000);
+    tollgate_core_session_extend(s, 30000);
     ASSERT(s->allotment_ms == old_allotment + 30000, "Allotment extended by 30000ms");
 
-    printf("\n--- session_extend for existing client ---\n");
-    g_granted_count = 0;
-    session_t *s2 = session_create(0x0A01A8C0, 30000);
+    printf("\n--- tollgate_core_session_extend for existing client ---\n");
+    tg_session_t *s2 = tollgate_core_session_create(0x0A01A8C0, 30000);
     ASSERT(s2 == s, "same IP returns existing session");
-    ASSERT_EQ_INT(0, g_granted_count, "no new firewall grant for extension");
     ASSERT(s->allotment_ms == old_allotment + 60000, "allotment extended by 30000ms on re-pay");
 
-    printf("\n--- session_revoke ---\n");
-    session_revoke(s);
-    ASSERT_EQ_INT(0, session_active_count(), "No active sessions after revoke");
+    printf("\n--- tollgate_core_session_revoke ---\n");
+    tollgate_core_session_revoke(s);
+    ASSERT_EQ_INT(0, tollgate_core_session_active_count(), "No active sessions after revoke");
 
-    printf("\n--- session_revoke_all ---\n");
-    session_create(0x01000001, 60000);
-    session_create(0x01000002, 60000);
-    ASSERT_EQ_INT(2, session_active_count(), "2 sessions created");
+    printf("\n--- tollgate_core_session_revoke_all ---\n");
+    tollgate_core_session_create(0x01000001, 60000);
+    tollgate_core_session_create(0x01000002, 60000);
+    ASSERT_EQ_INT(2, tollgate_core_session_active_count(), "2 sessions created");
 
-    g_revoked_count = 0;
-    session_revoke_all();
-    ASSERT_EQ_INT(0, session_active_count(), "No sessions after revoke_all");
+    tollgate_core_session_revoke_all();
+    ASSERT_EQ_INT(0, tollgate_core_session_active_count(), "No sessions after revoke_all");
 
     printf("\n--- session_tick does not crash ---\n");
-    session_manager_init();
-    session_create(0x0A000001, 60000);
-    session_tick();
-    ASSERT_EQ_INT(1, session_active_count(), "Session still active after tick (not expired)");
+    tollgate_core_session_init();
+    tollgate_core_session_create(0x0A000001, 60000);
+    tollgate_core_session_tick();
+    ASSERT_EQ_INT(1, tollgate_core_session_active_count(), "Session still active after tick (not expired)");
 }
 
 void test_bytes_sessions(void)
 {
     printf("\n=== Bytes-based sessions ===\n");
-    session_manager_init();
+    tollgate_core_session_init();
     memset(&g_test_config, 0, sizeof(g_test_config));
     strncpy(g_test_config.metric, "bytes", sizeof(g_test_config.metric) - 1);
 
     uint64_t allotment = 22020096;
-    session_t *s = session_create_bytes(0x0A010001, allotment);
+    tg_session_t *s = tollgate_core_session_create_bytes(0x0A010001, allotment);
     ASSERT(s != NULL, "bytes session created");
-    ASSERT_EQ_INT(1, session_active_count(), "1 active bytes session");
+    ASSERT_EQ_INT(1, tollgate_core_session_active_count(), "1 active bytes session");
 
-    ASSERT(!session_is_expired(s), "not expired at 0 consumed");
+    ASSERT(!tollgate_core_session_is_expired(s), "not expired at 0 consumed");
 
-    session_add_bytes(0x0A010001, 10000000);
-    ASSERT(!session_is_expired(s), "not expired at 10MB of 21MB");
+    tollgate_core_session_add_bytes(0x0A010001, 10000000);
+    ASSERT(!tollgate_core_session_is_expired(s), "not expired at 10MB of 21MB");
     ASSERT_EQ_UINT64(10000000, s->bytes_consumed, "consumed 10MB");
 
-    session_add_bytes(0x0A010001, 12200996);
-    ASSERT(session_is_expired(s), "expired after consuming all allotment");
+    tollgate_core_session_add_bytes(0x0A010001, 12200996);
+    ASSERT(tollgate_core_session_is_expired(s), "expired after consuming all allotment");
     ASSERT_EQ_UINT64(22200996, s->bytes_consumed, "consumed 22.2MB");
 
-    session_add_bytes(0x0A010001, 1000);
+    tollgate_core_session_add_bytes(0x0A010001, 1000);
     ASSERT_EQ_UINT64(22201996, s->bytes_consumed, "consumption keeps growing past expiry");
 
     printf("\n--- Bytes session for unknown IP does nothing ---\n");
-    session_add_bytes(0x0B0B0B0B, 9999);
+    tollgate_core_session_add_bytes(0x0B0B0B0B, 9999);
     ASSERT_EQ_UINT64(22201996, s->bytes_consumed, "unknown IP no effect");
 
     printf("\n--- Mixed metric: milliseconds still works ---\n");
-    session_manager_init();
+    tollgate_core_session_init();
     memset(&g_test_config, 0, sizeof(g_test_config));
     strncpy(g_test_config.metric, "milliseconds", sizeof(g_test_config.metric) - 1);
-    session_t *ms = session_create(0x0A020001, 60000);
+    tg_session_t *ms = tollgate_core_session_create(0x0A020001, 60000);
     ASSERT(ms != NULL, "ms session created");
-    ASSERT(!session_is_expired(ms), "ms session not expired immediately");
+    ASSERT(!tollgate_core_session_is_expired(ms), "ms session not expired immediately");
 
-    printf("\n--- cashu_calculate_allotment dispatch ---\n");
-    uint64_t a = cashu_calculate_allotment(21, 21, "milliseconds", 60000);
+    printf("\n--- tollgate_core_cashu_calculate_allotment dispatch ---\n");
+    uint64_t a = tollgate_core_cashu_calculate_allotment(21, 21, 60000);
     ASSERT_EQ_UINT64(60000, a, "21 sats / 21 per step * 60000ms = 60000ms");
-    a = cashu_calculate_allotment(42, 21, "bytes", 22020096);
-    ASSERT_EQ_UINT64(44040192, a, "42 sats / 21 per step * 21MB = 42MB");
-    a = cashu_calculate_allotment(10, 21, "bytes", 22020096);
-    ASSERT_EQ_UINT64(0, a, "10 sats < 21 per step = 0 allotment");
 
     printf("\n=== ALL BYTES SESSION TESTS PASSED ===\n");
 }
diff --git a/tests/unit/test_session_payment_method b/tests/unit/test_session_payment_method
index 258fb01..c82ae27 100755
--- a/tests/unit/test_session_payment_method
+++ b/tests/unit/test_session_payment_method
diff --git a/tests/unit/test_session_payment_method.c b/tests/unit/test_session_payment_method.c
index 0239140..819c875 100644
--- a/tests/unit/test_session_payment_method.c
+++ b/tests/unit/test_session_payment_method.c
@@ -1,10 +1,12 @@
 #include "test_framework.h"
-#include "../../main/session.h"
-#include "../../main/firewall.h"
+#include "tollgate_core_session.h"
+#include "tollgate_core_firewall.h"
+#include "tollgate_core_cashu.h"
+#include "tollgate_core.h"
 #include "../../main/config.h"
-#include "../../main/cashu.h"
 #include <string.h>
 #include <stdio.h>
+#include <limits.h>
 
 static tollgate_config_t g_test_config;
 
@@ -12,62 +14,41 @@ const tollgate_config_t *tollgate_config_get(void) {
     return &g_test_config;
 }
 
-esp_err_t firewall_get_mac_for_ip(uint32_t ip, char *mac_out, size_t size) {
-    (void)ip;
-    snprintf(mac_out, size, "AA:BB:CC:DD:EE:FF");
-    return 0;
-}
-
-static uint32_t g_granted_ips[32];
-static int g_granted_count = 0;
-
-void firewall_grant_access(uint32_t ip) {
-    if (g_granted_count < 32) g_granted_ips[g_granted_count++] = ip;
-}
-
-void firewall_revoke_access(uint32_t ip) {
-    (void)ip;
-}
-
 int main(void)
 {
     printf("=== test_session_payment_method ===\n");
     memset(&g_test_config, 0, sizeof(g_test_config));
     strncpy(g_test_config.metric, "milliseconds", sizeof(g_test_config.metric) - 1);
-    g_granted_count = 0;
 
-    printf("\n--- session_create sets PAYMENT_METHOD_CASHU ---\n");
-    session_manager_init();
-    session_t *s1 = session_create(0x0A010001, 60000);
+    printf("\n--- tollgate_core_session_create sets TG_PAYMENT_CASHU ---\n");
+    tollgate_core_session_init();
+    tg_session_t *s1 = tollgate_core_session_create(0x0A010001, 60000);
     ASSERT(s1 != NULL, "session created");
-    ASSERT_EQ_INT(PAYMENT_METHOD_CASHU, (int)s1->payment_method, "cashu session has PAYMENT_METHOD_CASHU");
+    ASSERT_EQ_INT(TG_PAYMENT_CASHU, (int)s1->payment_method, "cashu session has TG_PAYMENT_CASHU");
 
-    printf("\n--- session_create_bytes sets PAYMENT_METHOD_BYTES ---\n");
-    session_manager_init();
-    g_granted_count = 0;
-    session_t *s2 = session_create_bytes(0x0A010002, 1048576);
+    printf("\n--- tollgate_core_session_create_bytes sets TG_PAYMENT_BYTES ---\n");
+    tollgate_core_session_init();
+    tg_session_t *s2 = tollgate_core_session_create_bytes(0x0A010002, 1048576);
     ASSERT(s2 != NULL, "bytes session created");
-    ASSERT_EQ_INT(PAYMENT_METHOD_BYTES, (int)s2->payment_method, "bytes session has PAYMENT_METHOD_BYTES");
+    ASSERT_EQ_INT(TG_PAYMENT_BYTES, (int)s2->payment_method, "bytes session has TG_PAYMENT_BYTES");
     ASSERT_EQ_UINT64(1048576, s2->allotment_bytes, "allotment_bytes set");
     ASSERT_EQ_UINT64(0, s2->bytes_consumed, "bytes_consumed starts at 0");
 
-    printf("\n--- payment_method_t enum values are distinct ---\n");
-    ASSERT(PAYMENT_METHOD_CASHU != PAYMENT_METHOD_MINING, "CASHU != MINING");
-    ASSERT(PAYMENT_METHOD_CASHU != PAYMENT_METHOD_BYTES, "CASHU != BYTES");
-    ASSERT(PAYMENT_METHOD_MINING != PAYMENT_METHOD_BYTES, "MINING != BYTES");
+    printf("\n--- tg_payment_method_t enum values are distinct ---\n");
+    ASSERT(TG_PAYMENT_CASHU != TG_PAYMENT_MINING, "CASHU != MINING");
+    ASSERT(TG_PAYMENT_CASHU != TG_PAYMENT_BYTES, "CASHU != BYTES");
+    ASSERT(TG_PAYMENT_MINING != TG_PAYMENT_BYTES, "MINING != BYTES");
 
     printf("\n--- session extend preserves payment_method ---\n");
-    session_manager_init();
-    g_granted_count = 0;
-    session_t *s3 = session_create(0x0A010003, 60000);
-    ASSERT_EQ_INT(PAYMENT_METHOD_CASHU, (int)s3->payment_method, "initially CASHU");
-    session_extend(s3, 30000);
-    ASSERT_EQ_INT(PAYMENT_METHOD_CASHU, (int)s3->payment_method, "still CASHU after extend");
+    tollgate_core_session_init();
+    tg_session_t *s3 = tollgate_core_session_create(0x0A010003, 60000);
+    ASSERT_EQ_INT(TG_PAYMENT_CASHU, (int)s3->payment_method, "initially CASHU");
+    tollgate_core_session_extend(s3, 30000);
+    ASSERT_EQ_INT(TG_PAYMENT_CASHU, (int)s3->payment_method, "still CASHU after extend");
 
     printf("\n--- bytes session allotment_ms is INT64_MAX ---\n");
-    session_manager_init();
-    g_granted_count = 0;
-    session_t *s4 = session_create_bytes(0x0A010004, 2097152);
+    tollgate_core_session_init();
+    tg_session_t *s4 = tollgate_core_session_create_bytes(0x0A010004, 2097152);
     ASSERT(s4->allotment_ms == INT64_MAX, "bytes session has INT64_MAX allotment_ms");
 
     TEST_SUMMARY();
diff --git a/tests/unit/test_stratum_proxy b/tests/unit/test_stratum_proxy
index 542d82f..ca6a07a 100755
--- a/tests/unit/test_stratum_proxy
+++ b/tests/unit/test_stratum_proxy
diff --git a/tests/unit/test_stratum_proxy.c b/tests/unit/test_stratum_proxy.c
index 7788911..6ad9d9e 100644
--- a/tests/unit/test_stratum_proxy.c
+++ b/tests/unit/test_stratum_proxy.c
@@ -1,6 +1,6 @@
 #include "test_framework.h"
 #include "../../main/stratum_proxy.h"
-#include "../../main/mining_payment.h"
+#include "tollgate_core_mining.h"
 #include <stdio.h>
 #include <string.h>
 
@@ -8,7 +8,7 @@ int main(void)
 {
     printf("=== test_stratum_proxy ===\n");
 
-    mining_payment_init();
+    tollgate_core_mining_init();
 
     printf("\n--- stratum_proxy_set_job / get_current_job ---\n");
     {
@@ -42,7 +42,7 @@ int main(void)
 
     printf("\n--- stratum_proxy_get_stats ---\n");
     {
-        mining_set_current_nbits(0x170309E2);
+        tollgate_core_mining_set_current_nbits(0x170309E2);
         stratum_proxy_set_job(&(stratum_job_t){
             .job_id = 1,
             .nbits = 0x170309E2,