Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
af1714db08
commit
910bee899a
7 files changed
+351
-11
No files matched your search
@@ -196,6 +196,149 @@ TEST(FairnessLimiter, GridIsNonDestructive) {
|
||||
EXPECT_STREQ(a, b); // repeated calls give the same picture
|
||||
}
|
||||
|
||||
// ── per-origin advert window (issue #2) and dry-run (issue #1) ──────────────
|
||||
|
||||
static Packet makeAdvert(uint8_t k0, uint8_t k1 = 0xAA) {
|
||||
return makePacket(ROUTE_TYPE_FLOOD, PAYLOAD_TYPE_ADVERT, {k0, k1, 0x01, 0x02, 0x03});
|
||||
}
|
||||
static const uint32_t HOUR = 3600UL * 1000UL;
|
||||
|
||||
TEST(AdvertWindow, OffByDefault) {
|
||||
FairnessLimiter fl;
|
||||
fl.setBucketsEnabled(false); // isolate the window from the buckets
|
||||
Packet a = makeAdvert(0xDF);
|
||||
for (int i = 0; i < 10; i++) EXPECT_TRUE(fl.allowPacket(&a, i * 60000));
|
||||
EXPECT_EQ(fl.deniedWindow(), 0u);
|
||||
}
|
||||
|
||||
TEST(AdvertWindow, OncePerWindowPerOrigin) {
|
||||
FairnessLimiter fl;
|
||||
fl.setBucketsEnabled(false);
|
||||
fl.advertWindow().setHours(12);
|
||||
Packet cp1 = makeAdvert(0xDF), other = makeAdvert(0x42);
|
||||
EXPECT_TRUE(fl.allowPacket(&cp1, 0));
|
||||
for (int m = 1; m < 12 * 60; m++) EXPECT_FALSE(fl.allowPacket(&cp1, m * 60000UL)); // every minute
|
||||
EXPECT_EQ(fl.lastShed(), FAIR_SHED_WINDOW);
|
||||
EXPECT_TRUE(fl.allowPacket(&other, 5 * HOUR)); // a different origin is unaffected
|
||||
EXPECT_EQ(fl.lastShed(), FAIR_SHED_NONE);
|
||||
EXPECT_TRUE(fl.allowPacket(&cp1, 12 * HOUR)); // window over: one more pass
|
||||
EXPECT_FALSE(fl.allowPacket(&cp1, 12 * HOUR + 1));
|
||||
EXPECT_EQ(fl.deniedWindow(), 12u * 60 - 1 + 1);
|
||||
}
|
||||
|
||||
TEST(AdvertWindow, KeyIsFourBytesOfPubkey) {
|
||||
FairnessLimiter fl;
|
||||
fl.setBucketsEnabled(false);
|
||||
fl.advertWindow().setHours(1);
|
||||
Packet a = makeAdvert(0xDF, 0x33), b = makeAdvert(0xDF, 0x34); // same 1st byte only
|
||||
EXPECT_TRUE(fl.allowPacket(&a, 0));
|
||||
EXPECT_TRUE(fl.allowPacket(&b, 0));
|
||||
}
|
||||
|
||||
TEST(AdvertWindow, DirectAndShortAdvertsUntouched) {
|
||||
FairnessLimiter fl;
|
||||
fl.setBucketsEnabled(false);
|
||||
fl.advertWindow().setHours(24);
|
||||
Packet d = makePacket(ROUTE_TYPE_DIRECT, PAYLOAD_TYPE_ADVERT, {0xDF, 0x33, 1, 2});
|
||||
Packet s = makePacket(ROUTE_TYPE_FLOOD, PAYLOAD_TYPE_ADVERT, {0xDF, 0x33});
|
||||
for (int i = 0; i < 3; i++) {
|
||||
EXPECT_TRUE(fl.allowPacket(&d, 0));
|
||||
EXPECT_TRUE(fl.allowPacket(&s, 0));
|
||||
}
|
||||
EXPECT_EQ(fl.deniedWindow(), 0u);
|
||||
}
|
||||
|
||||
TEST(AdvertWindow, SurvivesMillisWrap) {
|
||||
FairnessLimiter fl;
|
||||
fl.setBucketsEnabled(false);
|
||||
fl.advertWindow().setHours(1);
|
||||
Packet a = makeAdvert(0xDF);
|
||||
uint32_t t0 = 0xFFFFFFFFu - 1000;
|
||||
EXPECT_TRUE(fl.allowPacket(&a, t0));
|
||||
EXPECT_FALSE(fl.allowPacket(&a, t0 + 30 * 60000UL)); // wrapped, still inside the hour
|
||||
EXPECT_TRUE(fl.allowPacket(&a, t0 + HOUR));
|
||||
}
|
||||
|
||||
TEST(AdvertWindow, FullRingEvictsOldestAndCountsIt) {
|
||||
FairnessLimiter fl;
|
||||
fl.setBucketsEnabled(false);
|
||||
AdvertWindow& w = fl.advertWindow();
|
||||
w.setHours(24);
|
||||
for (int i = 0; i < w.capacity() + 1; i++) {
|
||||
Packet a = makeAdvert((uint8_t)(i & 0xFF), (uint8_t)(i >> 8));
|
||||
EXPECT_TRUE(fl.allowPacket(&a, 0));
|
||||
}
|
||||
EXPECT_EQ(w.count(), w.capacity());
|
||||
EXPECT_EQ(w.evicted(), 1u);
|
||||
Packet first = makeAdvert(0, 0); // the evicted one passes again
|
||||
EXPECT_TRUE(fl.allowPacket(&first, 1000));
|
||||
Packet last = makeAdvert((uint8_t)(w.capacity() & 0xFF), (uint8_t)(w.capacity() >> 8));
|
||||
EXPECT_FALSE(fl.allowPacket(&last, 1000)); // a recent one is still held
|
||||
}
|
||||
|
||||
TEST(AdvertWindow, HeldAdvertDoesNotTakeABucketToken) {
|
||||
FairnessLimiter fl;
|
||||
fl.refillSenderLow(); // 1 advert token per bucket
|
||||
fl.advertWindow().setHours(1);
|
||||
Packet cp1 = makeAdvert(0x5F); // 0x5F and 0xDF share a 7-bit bucket
|
||||
Packet innocent = makeAdvert(0xDF);
|
||||
EXPECT_TRUE(fl.allowPacket(&cp1, 0)); // takes the only token
|
||||
fl.refillSenderLow();
|
||||
EXPECT_FALSE(fl.allowPacket(&cp1, 60000)); // held by the window, token untouched
|
||||
EXPECT_TRUE(fl.allowPacket(&innocent, 60000));
|
||||
EXPECT_EQ(fl.deniedSenderLow(), 0u);
|
||||
}
|
||||
|
||||
TEST(DryRun, CountsButForwards) {
|
||||
FairnessLimiter fl; // zero tokens everywhere
|
||||
fl.setDryRun(true);
|
||||
fl.advertWindow().setHours(1);
|
||||
Packet g = makePacket(ROUTE_TYPE_FLOOD, PAYLOAD_TYPE_GRP_TXT, {0xEF, 0, 0});
|
||||
EXPECT_TRUE(fl.allowPacket(&g, 0));
|
||||
EXPECT_EQ(fl.lastShed(), FAIR_SHED_GROUP);
|
||||
EXPECT_EQ(fl.deniedGroup(), 1u);
|
||||
Packet a = makeAdvert(0xDF);
|
||||
fl.refillSenderLow();
|
||||
EXPECT_TRUE(fl.allowPacket(&a, 0)); // first: passes on its merits
|
||||
EXPECT_EQ(fl.lastShed(), FAIR_SHED_NONE);
|
||||
EXPECT_TRUE(fl.allowPacket(&a, 1000)); // repeat: would be held
|
||||
EXPECT_EQ(fl.lastShed(), FAIR_SHED_WINDOW);
|
||||
EXPECT_EQ(fl.deniedWindow(), 1u);
|
||||
}
|
||||
|
||||
TEST(DryRun, SameVerdictsAsEnforcing) {
|
||||
// Dry-run must predict enforcement exactly: a shed packet takes no token
|
||||
// and records no window entry in either mode.
|
||||
FairnessLimiter real, dry;
|
||||
dry.setDryRun(true);
|
||||
real.advertWindow().setHours(2);
|
||||
dry.advertWindow().setHours(2);
|
||||
real.refillSenderLow();
|
||||
dry.refillSenderLow();
|
||||
uint32_t t = 0;
|
||||
for (int i = 0; i < 200; i++, t += 47000) {
|
||||
Packet a = makeAdvert((uint8_t)(i % 3 == 0 ? 0xDF : i), 0x10);
|
||||
if (i % 40 == 0) { real.refillSenderLow(); dry.refillSenderLow(); }
|
||||
bool r = real.allowPacket(&a, t);
|
||||
dry.allowPacket(&a, t);
|
||||
EXPECT_EQ(r, real.lastShed() == FAIR_SHED_NONE);
|
||||
EXPECT_EQ(real.lastShed(), dry.lastShed()) << "i=" << i;
|
||||
}
|
||||
EXPECT_EQ(real.deniedWindow(), dry.deniedWindow());
|
||||
EXPECT_EQ(real.deniedSenderLow(), dry.deniedSenderLow());
|
||||
}
|
||||
|
||||
TEST(DryRun, ShedAirtimeAccumulatesPerReason) {
|
||||
FairnessLimiter fl;
|
||||
fl.addShedAirtime(FAIR_SHED_WINDOW, 900);
|
||||
fl.addShedAirtime(FAIR_SHED_WINDOW, 850);
|
||||
fl.addShedAirtime(FAIR_SHED_GROUP, 300);
|
||||
fl.addShedAirtime(FAIR_SHED_N, 99999); // out of range: ignored
|
||||
EXPECT_EQ(fl.shedAirtimeMs(FAIR_SHED_WINDOW), 1750u);
|
||||
EXPECT_EQ(fl.shedAirtimeMs(FAIR_SHED_GROUP), 300u);
|
||||
EXPECT_EQ(fl.shedAirtimeMs(FAIR_SHED_SENDER), 0u);
|
||||
}
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
return RUN_ALL_TESTS();
|
||||
|
||||
Reference in new issue
Block a user