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

1 files changed, 47 insertions, 75 deletions

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");
 }