Fix unit test hardhat

1Hive · Nov 6, 2023 · 1a0e06d · 1a0e06d
1 parent b3d25f4
commit 1a0e06d
Show file tree

Hide file tree

Showing 11 changed files with 903 additions and 329 deletions.
diff --git a/packages/hardhat/contracts/mocks/OwnableCelesteMock.sol b/packages/hardhat/contracts/mocks/OwnableCelesteMock.sol
@@ -56,14 +56,14 @@ interface IArbitrator {
      * @param _evidence Data submitted for the evidence related to the dispute
      */
     function submitEvidence(
-        IArbitrable _subject,
         uint256 _disputeId,
         address _submitter,
         bytes calldata _evidence
     ) external;
 
     /**
      * @dev Close the evidence period of a dispute
+     * @param _subject Arbitrable instance submitting the dispute
      * @param _disputeId Identification number of the dispute to close its evidence submitting period
      */
     function closeEvidencePeriod(
@@ -395,7 +395,6 @@ contract OwnableCeleste is IArbitrator {
 
     /**
      * @notice Submit evidence for a dispute #`_disputeId`
-     * @param _subject Arbitrable instance submitting the dispute
      * @param _disputeId Identification number of the dispute receiving new evidence
      * @param _submitter Address of the account submitting the evidence
      * @param _evidence Data submitted for the evidence of the dispute
@@ -405,9 +404,11 @@ contract OwnableCeleste is IArbitrator {
         address _submitter,
         bytes calldata _evidence
     ) external disputeExists(_disputeId) {
-        IArbitrable _subject = IArbitrable(msg.sender);
         Dispute storage dispute = disputes[_disputeId];
-        require(dispute.subject == _subject, "DM_SUBJECT_NOT_DISPUTE_SUBJECT");
+        require(
+            dispute.subject == IArbitrable(msg.sender),
+            "DM_SUBJECT_NOT_DISPUTE_SUBJECT"
+        );
         emit EvidenceSubmitted(_disputeId, _submitter, _evidence);
     }
 

diff --git a/packages/hardhat/hardhat.config.ts b/packages/hardhat/hardhat.config.ts
@@ -2,7 +2,6 @@ import { config as dotenvConfig } from "dotenv";
 import "hardhat-deploy";
 import fs from "fs";
 import chalk from "chalk";
-import "@tenderly/hardhat-tenderly";
 import "@nomiclabs/hardhat-etherscan";
 import "@openzeppelin/hardhat-upgrades";
 import "@nomiclabs/hardhat-ethers";

diff --git a/packages/hardhat/package.json b/packages/hardhat/package.json
@@ -15,7 +15,6 @@
     "@openzeppelin/contracts": "^4.9.2",
     "@openzeppelin/contracts-upgradeable": "^4.9.3",
     "@openzeppelin/hardhat-upgrades": "^1.0.0",
-    "@tenderly/hardhat-tenderly": "^1.7.7",
     "@typechain/ethers-v5": "^5.0.0",
     "@types/chai": "^4.2.21",
     "@types/mocha": "^9.0.0",

diff --git a/packages/hardhat/typechain/IArbitrable.d.ts b/packages/hardhat/typechain/IArbitrable.d.ts
@@ -0,0 +1,56 @@
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+
+import {
+  ethers,
+  EventFilter,
+  Signer,
+  BigNumber,
+  BigNumberish,
+  PopulatedTransaction,
+} from "ethers";
+import { Contract, ContractTransaction } from "@ethersproject/contracts";
+import { BytesLike } from "@ethersproject/bytes";
+import { Listener, Provider } from "@ethersproject/providers";
+import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
+
+interface IArbitrableInterface extends ethers.utils.Interface {
+  functions: {};
+
+  events: {
+    "Ruled(address,uint256,uint256)": EventFragment;
+  };
+
+  getEvent(nameOrSignatureOrTopic: "Ruled"): EventFragment;
+}
+
+export class IArbitrable extends Contract {
+  connect(signerOrProvider: Signer | Provider | string): this;
+  attach(addressOrName: string): this;
+  deployed(): Promise<this>;
+
+  on(event: EventFilter | string, listener: Listener): this;
+  once(event: EventFilter | string, listener: Listener): this;
+  addListener(eventName: EventFilter | string, listener: Listener): this;
+  removeAllListeners(eventName: EventFilter | string): this;
+  removeListener(eventName: any, listener: Listener): this;
+
+  interface: IArbitrableInterface;
+
+  functions: {};
+
+  callStatic: {};
+
+  filters: {
+    Ruled(
+      arbitrator: string | null,
+      disputeId: BigNumberish | null,
+      ruling: null
+    ): EventFilter;
+  };
+
+  estimateGas: {};
+
+  populateTransaction: {};
+}
diff --git a/packages/hardhat/typechain/IArbitrator.d.ts b/packages/hardhat/typechain/IArbitrator.d.ts
@@ -24,8 +24,8 @@ interface IArbitratorInterface extends ethers.utils.Interface {
   functions: {
     "getDisputeFees()": FunctionFragment;
     "submitEvidence(uint256,address,bytes)": FunctionFragment;
-    "closeEvidencePeriod(uint256)": FunctionFragment;
     "createDispute(uint256,bytes)": FunctionFragment;
+    "closeEvidencePeriod(address,uint256)": FunctionFragment;
     "rule(uint256)": FunctionFragment;
   };
 
@@ -37,14 +37,14 @@ interface IArbitratorInterface extends ethers.utils.Interface {
     functionFragment: "submitEvidence",
     values: [BigNumberish, string, BytesLike]
   ): string;
-  encodeFunctionData(
-    functionFragment: "closeEvidencePeriod",
-    values: [BigNumberish]
-  ): string;
   encodeFunctionData(
     functionFragment: "createDispute",
     values: [BigNumberish, BytesLike]
   ): string;
+  encodeFunctionData(
+    functionFragment: "closeEvidencePeriod",
+    values: [string, BigNumberish]
+  ): string;
   encodeFunctionData(functionFragment: "rule", values: [BigNumberish]): string;
 
   decodeFunctionResult(
@@ -56,11 +56,11 @@ interface IArbitratorInterface extends ethers.utils.Interface {
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "closeEvidencePeriod",
+    functionFragment: "createDispute",
     data: BytesLike
   ): Result;
   decodeFunctionResult(
-    functionFragment: "createDispute",
+    functionFragment: "closeEvidencePeriod",
     data: BytesLike
   ): Result;
   decodeFunctionResult(functionFragment: "rule", data: BytesLike): Result;
@@ -116,16 +116,6 @@ export class IArbitrator extends Contract {
       overrides?: Overrides
     ): Promise<ContractTransaction>;
 
-    closeEvidencePeriod(
-      _disputeId: BigNumberish,
-      overrides?: Overrides
-    ): Promise<ContractTransaction>;
-
-    "closeEvidencePeriod(uint256)"(
-      _disputeId: BigNumberish,
-      overrides?: Overrides
-    ): Promise<ContractTransaction>;
-
     createDispute(
       _possibleRulings: BigNumberish,
       _metadata: BytesLike,
@@ -138,6 +128,18 @@ export class IArbitrator extends Contract {
       overrides?: Overrides
     ): Promise<ContractTransaction>;
 
+    closeEvidencePeriod(
+      _subject: string,
+      _disputeId: BigNumberish,
+      overrides?: Overrides
+    ): Promise<ContractTransaction>;
+
+    "closeEvidencePeriod(address,uint256)"(
+      _subject: string,
+      _disputeId: BigNumberish,
+      overrides?: Overrides
+    ): Promise<ContractTransaction>;
+
     rule(
       _disputeId: BigNumberish,
       overrides?: Overrides
@@ -183,16 +185,6 @@ export class IArbitrator extends Contract {
     overrides?: Overrides
   ): Promise<ContractTransaction>;
 
-  closeEvidencePeriod(
-    _disputeId: BigNumberish,
-    overrides?: Overrides
-  ): Promise<ContractTransaction>;
-
-  "closeEvidencePeriod(uint256)"(
-    _disputeId: BigNumberish,
-    overrides?: Overrides
-  ): Promise<ContractTransaction>;
-
   createDispute(
     _possibleRulings: BigNumberish,
     _metadata: BytesLike,
@@ -205,6 +197,18 @@ export class IArbitrator extends Contract {
     overrides?: Overrides
   ): Promise<ContractTransaction>;
 
+  closeEvidencePeriod(
+    _subject: string,
+    _disputeId: BigNumberish,
+    overrides?: Overrides
+  ): Promise<ContractTransaction>;
+
+  "closeEvidencePeriod(address,uint256)"(
+    _subject: string,
+    _disputeId: BigNumberish,
+    overrides?: Overrides
+  ): Promise<ContractTransaction>;
+
   rule(
     _disputeId: BigNumberish,
     overrides?: Overrides
@@ -250,16 +254,6 @@ export class IArbitrator extends Contract {
       overrides?: CallOverrides
     ): Promise<void>;
 
-    closeEvidencePeriod(
-      _disputeId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    "closeEvidencePeriod(uint256)"(
-      _disputeId: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
     createDispute(
       _possibleRulings: BigNumberish,
       _metadata: BytesLike,
@@ -272,6 +266,18 @@ export class IArbitrator extends Contract {
       overrides?: CallOverrides
     ): Promise<BigNumber>;
 
+    closeEvidencePeriod(
+      _subject: string,
+      _disputeId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
+    "closeEvidencePeriod(address,uint256)"(
+      _subject: string,
+      _disputeId: BigNumberish,
+      overrides?: CallOverrides
+    ): Promise<void>;
+
     rule(
       _disputeId: BigNumberish,
       overrides?: CallOverrides
@@ -304,16 +310,6 @@ export class IArbitrator extends Contract {
       overrides?: Overrides
     ): Promise<BigNumber>;
 
-    closeEvidencePeriod(
-      _disputeId: BigNumberish,
-      overrides?: Overrides
-    ): Promise<BigNumber>;
-
-    "closeEvidencePeriod(uint256)"(
-      _disputeId: BigNumberish,
-      overrides?: Overrides
-    ): Promise<BigNumber>;
-
     createDispute(
       _possibleRulings: BigNumberish,
       _metadata: BytesLike,
@@ -326,6 +322,18 @@ export class IArbitrator extends Contract {
       overrides?: Overrides
     ): Promise<BigNumber>;
 
+    closeEvidencePeriod(
+      _subject: string,
+      _disputeId: BigNumberish,
+      overrides?: Overrides
+    ): Promise<BigNumber>;
+
+    "closeEvidencePeriod(address,uint256)"(
+      _subject: string,
+      _disputeId: BigNumberish,
+      overrides?: Overrides
+    ): Promise<BigNumber>;
+
     rule(_disputeId: BigNumberish, overrides?: Overrides): Promise<BigNumber>;
 
     "rule(uint256)"(
@@ -355,16 +363,6 @@ export class IArbitrator extends Contract {
       overrides?: Overrides
     ): Promise<PopulatedTransaction>;
 
-    closeEvidencePeriod(
-      _disputeId: BigNumberish,
-      overrides?: Overrides
-    ): Promise<PopulatedTransaction>;
-
-    "closeEvidencePeriod(uint256)"(
-      _disputeId: BigNumberish,
-      overrides?: Overrides
-    ): Promise<PopulatedTransaction>;
-
     createDispute(
       _possibleRulings: BigNumberish,
       _metadata: BytesLike,
@@ -377,6 +375,18 @@ export class IArbitrator extends Contract {
       overrides?: Overrides
     ): Promise<PopulatedTransaction>;
 
+    closeEvidencePeriod(
+      _subject: string,
+      _disputeId: BigNumberish,
+      overrides?: Overrides
+    ): Promise<PopulatedTransaction>;
+
+    "closeEvidencePeriod(address,uint256)"(
+      _subject: string,
+      _disputeId: BigNumberish,
+      overrides?: Overrides
+    ): Promise<PopulatedTransaction>;
+
     rule(
       _disputeId: BigNumberish,
       overrides?: Overrides