add proposer/prover to fixture for re-use

packages/protocol/test/tokenomics/blockFee.test.ts

@@ -23,6 +23,7 @@ describe("tokenomics: blockFee", function () {
     let chan: SimpleChannel<number>;
     /* eslint-disable-next-line */
     let config: Awaited<ReturnType<TaikoL1["getConfig"]>>;
+    let proposer: Proposer;
 
     beforeEach(async () => {
         ({
@@ -36,6 +37,7 @@ describe("tokenomics: blockFee", function () {
             interval,
             chan,
             config,
+            proposer,
         } = await initIntegrationFixture(true, true));
     });
 
@@ -65,16 +67,6 @@ describe("tokenomics: blockFee", function () {
     });
 
     it("proposes blocks on interval, blockFee should increase, proposer's balance for TKOToken should decrease as it pays proposer fee, proofReward should increase since more slots are used and no proofs have been submitted", async function () {
-        // set up a proposer to continually propose new blocks
-        const proposer = new Proposer(
-            taikoL1.connect(proposerSigner),
-            l2Provider,
-            config.commitConfirmations.toNumber(),
-            config.maxNumBlocks.toNumber(),
-            0,
-            proposerSigner
-        );
-
         // get the initial tkoBalance, which should decrease every block proposal
         let lastProposerTkoBalance = await tkoTokenL1.balanceOf(
             await proposerSigner.getAddress()

packages/protocol/test/tokenomics/proofReward.test.ts

@@ -15,12 +15,13 @@ describe("tokenomics: proofReward", function () {
     let taikoL1: TaikoL1;
     let l2Provider: ethers.providers.JsonRpcProvider;
     let l1Signer: any;
-    let proposerSigner: any;
     let proverSigner: any;
     let genesisHeight: number;
     let tkoTokenL1: TestTkoToken;
     let interval: any;
     let chan: SimpleChannel<number>;
+    let proposer: Proposer;
+    let prover: Prover;
 
     /* eslint-disable-next-line */
     let config: Awaited<ReturnType<TaikoL1["getConfig"]>>;
@@ -30,13 +31,14 @@ describe("tokenomics: proofReward", function () {
             taikoL1,
             l2Provider,
             l1Signer,
-            proposerSigner,
             proverSigner,
             genesisHeight,
             tkoTokenL1,
             interval,
             chan,
             config,
+            proposer,
+            prover,
         } = await initIntegrationFixture(true, true));
     });
 
@@ -47,16 +49,6 @@ describe("tokenomics: proofReward", function () {
     });
 
     it(`proofReward is 1 wei if the prover does not hold any tkoTokens on L1`, async function () {
-        const proposer = new Proposer(
-            taikoL1.connect(proposerSigner),
-            l2Provider,
-            config.commitConfirmations.toNumber(),
-            config.maxNumBlocks.toNumber(),
-            0,
-            proposerSigner
-        );
-
-        const prover = new Prover(taikoL1, l2Provider, proverSigner);
         let proposed: boolean = false;
         l2Provider.on("block", function (blockNumber: number) {
             if (proposed) {
@@ -100,17 +92,6 @@ describe("tokenomics: proofReward", function () {
     the provers TKO balance should increase as the blocks are verified and
     they receive the proofReward.
     the proposer should receive a refund on his deposit because he holds a tkoBalance > 0 at time of verification.`, async function () {
-        const proposer = new Proposer(
-            taikoL1.connect(proposerSigner),
-            l2Provider,
-            config.commitConfirmations.toNumber(),
-            config.maxNumBlocks.toNumber(),
-            0,
-            proposerSigner
-        );
-
-        const prover = new Prover(taikoL1, l2Provider, proverSigner);
-
         // prover needs TKO or their reward will be cut down to 1 wei.
         await (
             await tkoTokenL1

packages/protocol/test/utils/fixture.ts

@@ -7,6 +7,8 @@ import deployTkoToken from "./tkoToken";
 import { ethers as hardhatEthers } from "hardhat";
 import { createAndSeedWallets, sendTinyEtherToZeroAddress } from "./seed";
 import { SimpleChannel } from "channel-ts";
+import Proposer from "./proposer";
+import Prover from "./prover";
 
 async function initIntegrationFixture(
     mintTkoToProposer: boolean,
@@ -97,6 +99,17 @@ async function initIntegrationFixture(
 
     const chan = new SimpleChannel<number>();
     const config = await taikoL1.getConfig();
+
+    const proposer = new Proposer(
+        taikoL1.connect(proposerSigner),
+        l2Provider,
+        config.commitConfirmations.toNumber(),
+        config.maxNumBlocks.toNumber(),
+        0,
+        proposerSigner
+    );
+
+    const prover = new Prover(taikoL1, l2Provider, proverSigner);
     return {
         taikoL1,
         taikoL2,
@@ -113,6 +126,8 @@ async function initIntegrationFixture(
         interval,
         chan,
         config,
+        proposer,
+        prover,
     };
 }