Merge pull request #286 from apasel422/tidy

Miscellaneous code cleanup in simulator

Author: martinthomson

impl/src/backend.ts

@@ -18,7 +18,7 @@ interface Impression {
   impressionSite: string;
   intermediarySite: string | undefined;
   conversionSites: Set<string>;
-  conversionCallers: Set<string>;
+  conversionCallers: ReadonlySet<string>;
   timestamp: Temporal.Instant;
   lifetime: Temporal.Duration;
   histogramIndex: number;
@@ -39,9 +39,9 @@ interface ValidatedConversionOptions {
   epsilon: number;
   histogramSize: number;
   lookback: Temporal.Duration;
-  matchValues: Set<number>;
-  impressionSites: Set<string>;
-  impressionCallers: Set<string>;
+  matchValues: ReadonlySet<number>;
+  impressionSites: ReadonlySet<string>;
+  impressionCallers: ReadonlySet<string>;
   credit: readonly number[];
   value: number;
   maxValue: number;
@@ -105,15 +105,15 @@ export class Backend {
     this.#delegate = delegate;
   }
 
-  get epochStarts(): Iterable<[string, Temporal.Instant]> {
-    return this.#epochStartStore.entries();
+  get epochStarts(): ReadonlyMap<string, Temporal.Instant> {
+    return this.#epochStartStore;
   }
 
-  get privacyBudgetEntries(): Iterable<Readonly<PrivacyBudgetStoreEntry>> {
+  get privacyBudgetEntries(): ReadonlyArray<Readonly<PrivacyBudgetStoreEntry>> {
     return this.#privacyBudgetStore;
   }
 
-  get impressions(): Iterable<Readonly<Impression>> {
+  get impressions(): ReadonlyArray<Readonly<Impression>> {
     return this.#impressions;
   }
 
@@ -517,7 +517,7 @@ export class Backend {
   }
 
   #fillHistogramWithLastNTouchAttribution(
-    matchedImpressions: Set<Impression>,
+    matchedImpressions: ReadonlySet<Impression>,
     histogramSize: number,
     value: number,
     credit: readonly number[],
@@ -618,7 +618,7 @@ export class Backend {
     );
   }
 
-  #zeroBudgetForSites(sites: Set<string>): void {
+  #zeroBudgetForSites(sites: ReadonlySet<string>): void {
     if (sites.size === 0) {
       throw new RangeError("need to specify at least one site when forgetting");
     }

impl/src/clear.test.ts

@@ -57,7 +57,7 @@ void test("clear-site-state", async () => {
   backend.clearState(["conv-one.example"], false);
 
   assert.equal(
-    [...backend.impressions].length,
+    backend.impressions.length,
     siteTable.length,
     "All the impressions remain unaffected",
   );
@@ -88,9 +88,9 @@ void test("forget-all-sites", async () => {
   const backend = await setupImpressions({ now, ...defaultConfig });
   backend.clearState([], true);
 
-  assert.equal([...backend.impressions].length, 0);
-  assert.equal([...backend.privacyBudgetEntries].length, 0);
-  assert.equal([...backend.epochStarts].length, 0);
+  assert.deepEqual(backend.impressions, []);
+  assert.deepEqual(backend.privacyBudgetEntries, []);
+  assert.deepEqual(backend.epochStarts, new Map());
   assert.deepEqual(
     backend.lastBrowsingHistoryClear,
     Temporal.Instant.from(now),
@@ -104,12 +104,12 @@ void test("forget-one-site-impressions", async () => {
   backend.clearState(["imp-one.example"], true);
 
   assert.deepEqual(
-    [...backend.impressions].map((i) => i.impressionSite),
+    backend.impressions.map((i) => i.impressionSite),
     siteTable.map((i) => i.impression).filter((i) => i !== "imp-one.example"),
     "Impressions for the affected site are removed",
   );
-  assert.equal([...backend.privacyBudgetEntries].length, 0);
-  assert.equal([...backend.epochStarts].length, 0);
+  assert.deepEqual(backend.privacyBudgetEntries, []);
+  assert.deepEqual(backend.epochStarts, new Map());
   assert.deepEqual(
     backend.lastBrowsingHistoryClear,
     Temporal.Instant.from(now),
@@ -128,15 +128,15 @@ void test("forget-one-site-conversions", async () => {
   });
   assert.ok(before.unencryptedHistogram!.some((v) => v > 0));
 
-  assert.ok([...backend.privacyBudgetEntries].length > 0);
-  assert.equal([...backend.epochStarts].length, 1);
+  assert.ok(backend.privacyBudgetEntries.length > 0);
+  assert.equal(backend.epochStarts.size, 1);
 
   backend.clearState(["conv-one.example"], true);
 
   // Conversions are unaffected, and conversion state is gone.
-  assert.equal([...backend.impressions].length, siteTable.length);
-  assert.equal([...backend.privacyBudgetEntries].length, 0);
-  assert.equal([...backend.epochStarts].length, 0);
+  assert.equal(backend.impressions.length, siteTable.length);
+  assert.deepEqual(backend.privacyBudgetEntries, []);
+  assert.deepEqual(backend.epochStarts, new Map());
   assert.deepEqual(
     backend.lastBrowsingHistoryClear,
     Temporal.Instant.from(now),
@@ -151,7 +151,7 @@ void test("forget-one-site-conversions", async () => {
   assert.ok(after.unencryptedHistogram!.every((v) => v === 0));
 
   // Privacy budget entries aren't added; this epoch is off-limits.
-  assert.equal([...backend.privacyBudgetEntries].length, 0);
+  assert.deepEqual(backend.privacyBudgetEntries, []);
   // The epoch start will be initialized.
-  assert.equal([...backend.epochStarts].length, 1);
+  assert.equal(backend.epochStarts.size, 1);
 });

impl/src/e2e.test.ts

@@ -93,7 +93,7 @@ function runTest(
   });
 
   for (const event of tc.events) {
-    const newNow = now.add({ seconds: event.seconds });
+    const newNow = Temporal.Instant.fromEpochMilliseconds(event.seconds * 1e3);
     if (Temporal.Instant.compare(newNow, now) <= 0) {
       throw new RangeError(
         "events must have strictly increasing seconds fields",

impl/src/fixture.ts

@@ -17,8 +17,9 @@ export interface TestConfig {
   privacyBudgetEpochDays: number;
 }
 
-export function makeBackend(overrideConfig?: Readonly<TestConfig>): Backend {
-  const config = overrideConfig ?? defaultConfig;
+export function makeBackend(
+  config: Readonly<TestConfig> = defaultConfig,
+): Backend {
   const now = config.now
     ? Temporal.Instant.from(config.now)
     : new Temporal.Instant(0n);