test: update tests to reflect register flow chnages

Author: Hakob23

test/discovery/fixtures.ts

@@ -39,6 +39,14 @@ export async function deployDiscoveryFixture() {
     .connect(owner)
     .grantRole(await collateralManagement.COLLATERAL_ADDER(), owner.address);
 
+  // Grant COLLATERAL_ADDER role to FlyoverDiscovery contract
+  await collateralManagement
+    .connect(owner)
+    .grantRole(
+      await collateralManagement.COLLATERAL_ADDER(),
+      await discovery.getAddress()
+    );
+
   return {
     discovery,
     collateralManagement,
@@ -58,7 +66,7 @@ export async function deployDiscoveryWithProvidersFixture() {
   if (!pegInLp || !pegOutLp || !fullLp)
     throw new Error("LP can't be undefined");
 
-  // Register providers (Discovery enforces msg.value but does not move funds)
+  // Register providers (Discovery now handles collateral addition automatically)
   await discovery
     .connect(pegInLp)
     .register("Pegin Provider", "lp1.com", true, ProviderType.PegIn, {
@@ -75,24 +83,6 @@ export async function deployDiscoveryWithProvidersFixture() {
       value: MIN_COLLATERAL * 2n,
     });
 
-  // Fund collateral management to reflect registration state
-  await collateralManagement
-    .connect(owner)
-    .addPegInCollateralTo(pegInLp.address, { value: MIN_COLLATERAL });
-
-  await collateralManagement
-    .connect(owner)
-    .addPegOutCollateralTo(pegOutLp.address, { value: MIN_COLLATERAL });
-
-  const half = MIN_COLLATERAL;
-  // For Both, split roughly half/half (rounding already exact as bigint)
-  await collateralManagement
-    .connect(owner)
-    .addPegInCollateralTo(fullLp.address, { value: half });
-  await collateralManagement
-    .connect(owner)
-    .addPegOutCollateralTo(fullLp.address, { value: half });
-
   return {
     discovery,
     collateralManagement,

test/discovery/listing-filter.test.ts

@@ -24,24 +24,18 @@ describe("FlyoverDiscovery listing filters", () => {
 });
 
 describe("FlyoverDiscovery listing edge cases", () => {
-  it("does not list providers without sufficient collateral until collateral is added", async () => {
-    const { discovery, collateralManagement, signers, owner, MIN_COLLATERAL } =
-      await loadFixture(deployDiscoveryFixture);
+  it("lists providers immediately after registration since collateral is added automatically", async () => {
+    const { discovery, signers, MIN_COLLATERAL } = await loadFixture(
+      deployDiscoveryFixture
+    );
     const lp = signers.at(-1)!;
 
     await discovery
       .connect(lp)
       .register("N", "U", true, ProviderType.PegIn, { value: MIN_COLLATERAL });
 
-    let providers = await discovery.getProviders();
-    // Not listed because collateral management not yet funded for this LP
-    expect(providers.length).to.equal(0);
-
-    await collateralManagement
-      .connect(owner)
-      .addPegInCollateralTo(lp.address, { value: MIN_COLLATERAL });
-
-    providers = await discovery.getProviders();
+    const providers = await discovery.getProviders();
+    // Provider is immediately listed because collateral is added automatically during registration
     expect(providers.length).to.equal(1);
     expect(providers[0].providerAddress).to.equal(lp.address);
   });

test/discovery/registration.test.ts

@@ -124,30 +124,24 @@ describe("FlyoverDiscovery registration edge cases", () => {
     ).to.be.revertedWithPanic(0x21);
   });
 
-  it("allows multiple registrations by the same EOA (separate ids)", async () => {
-    const { discovery, collateralManagement, owner, signers, MIN_COLLATERAL } =
-      await loadFixture(deployDiscoveryFixture);
+  it("prevents multiple registrations by the same EOA", async () => {
+    const { discovery, signers, MIN_COLLATERAL } = await loadFixture(
+      deployDiscoveryFixture
+    );
     const lp = signers.at(-1)!;
     await discovery.connect(lp).register("N1", "U1", true, ProviderType.PegIn, {
       value: MIN_COLLATERAL,
     });
-    await discovery
-      .connect(lp)
-      .register("N2", "U2", true, ProviderType.PegOut, {
-        value: MIN_COLLATERAL,
-      });
 
-    // Fund both sides so both registrations are listable
-    await collateralManagement
-      .connect(owner)
-      .addPegInCollateralTo(lp.address, { value: MIN_COLLATERAL });
-    await collateralManagement
-      .connect(owner)
-      .addPegOutCollateralTo(lp.address, { value: MIN_COLLATERAL });
+    // Second registration by the same EOA should fail
+    await expect(
+      discovery.connect(lp).register("N2", "U2", true, ProviderType.PegOut, {
+        value: MIN_COLLATERAL,
+      })
+    ).to.be.revertedWithCustomError(discovery, "AlreadyRegistered");
 
     const providers = await discovery.getProviders();
-    expect(providers.length).to.equal(2);
+    expect(providers.length).to.equal(1);
     expect(providers[0].providerAddress).to.equal(lp.address);
-    expect(providers[1].providerAddress).to.equal(lp.address);
   });
 });