Clean up the imports of test

bosagora · Aug 31, 2024 · c4b0cd4 · c4b0cd4
1 parent d38104a
commit c4b0cd4
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 56 deletions.
diff --git a/packages/relay/test/Approval.test.ts b/packages/relay/test/Approval.test.ts
@@ -32,12 +32,10 @@ import { getPurchaseId, TestClient, TestServer } from "./helper/Utility";
 import * as assert from "assert";
 import * as fs from "fs";
 import * as path from "path";
+import URI from "urijs";
 import { URL } from "url";
 import { ContractManager } from "../src/contract/ContractManager";
 
-// tslint:disable-next-line:no-var-requires
-const URI = require("urijs");
-
 chai.use(solidity);
 
 describe("Test of Server", function () {

diff --git a/packages/relay/test/Bridge.test.ts b/packages/relay/test/Bridge.test.ts
@@ -14,11 +14,9 @@ import chai, { expect } from "chai";
 import { solidity } from "ethereum-waffle";
 
 import * as path from "path";
+import URI from "urijs";
 import { URL } from "url";
 
-// tslint:disable-next-line:no-var-requires
-const URI = require("urijs");
-
 chai.use(solidity);
 
 describe("Test of Bridge", function () {

diff --git a/packages/relay/test/DelegatedTransfer.test.ts b/packages/relay/test/DelegatedTransfer.test.ts
@@ -14,11 +14,9 @@ import chai, { expect } from "chai";
 import { solidity } from "ethereum-waffle";
 
 import * as path from "path";
+import URI from "urijs";
 import { URL } from "url";
 
-// tslint:disable-next-line:no-var-requires
-const URI = require("urijs");
-
 chai.use(solidity);
 
 describe("Test of delegated transfer", function () {

diff --git a/packages/relay/test/Endpoints.test.ts b/packages/relay/test/Endpoints.test.ts
@@ -3,6 +3,7 @@ import "@nomiclabs/hardhat-waffle";
 
 import { Amount } from "../src/common/Amount";
 import { Config } from "../src/common/Config";
+import { ContractManager } from "../src/contract/ContractManager";
 import { GraphStorage } from "../src/storage/GraphStorage";
 import { RelayStorage } from "../src/storage/RelayStorage";
 import { ContractUtils, LoyaltyNetworkID } from "../src/utils/ContractUtils";
@@ -23,16 +24,14 @@ import chai, { expect } from "chai";
 import { solidity } from "ethereum-waffle";
 
 import * as path from "path";
+import URI from "urijs";
 import { URL } from "url";
 
 import { Wallet } from "ethers";
 
-// tslint:disable-next-line:no-implicit-dependencies
 import { AddressZero } from "@ethersproject/constants";
-import { ContractManager } from "../src/contract/ContractManager";
 
 // tslint:disable-next-line:no-var-requires
-const URI = require("urijs");
 
 chai.use(solidity);
 

diff --git a/packages/relay/test/ForcedClose.test.ts b/packages/relay/test/ForcedClose.test.ts
@@ -12,17 +12,7 @@ import { GraphStorage } from "../src/storage/GraphStorage";
 import { RelayStorage } from "../src/storage/RelayStorage";
 import { IShopData, IUserData, LoyaltyPaymentTaskStatus } from "../src/types";
 import { ContractUtils } from "../src/utils/ContractUtils";
-import {
-    BIP20DelegatedTransfer,
-    CurrencyRate,
-    Ledger,
-    LoyaltyConsumer,
-    LoyaltyExchanger,
-    LoyaltyProvider,
-    PhoneLinkCollection,
-    Shop,
-    Validator,
-} from "../typechain-types";
+import { BIP20DelegatedTransfer, Ledger, LoyaltyProvider } from "../typechain-types";
 import { Deployments } from "./helper/Deployments";
 import { FakerCallbackServer } from "./helper/FakerCallbackServer";
 import { getPurchaseId, TestClient, TestServer } from "./helper/Utility";
@@ -35,11 +25,9 @@ import { Wallet } from "ethers";
 import * as fs from "fs";
 import { ethers } from "hardhat";
 import * as path from "path";
+import URI from "urijs";
 import { URL } from "url";
 
-// tslint:disable-next-line:no-var-requires
-const URI = require("urijs");
-
 chai.use(solidity);
 
 describe("Test of Server", function () {

diff --git a/packages/relay/test/LoyaltyBridge.test.ts b/packages/relay/test/LoyaltyBridge.test.ts
@@ -14,11 +14,9 @@ import chai, { expect } from "chai";
 import { solidity } from "ethereum-waffle";
 
 import * as path from "path";
+import URI from "urijs";
 import { URL } from "url";
 
-// tslint:disable-next-line:no-var-requires
-const URI = require("urijs");
-
 chai.use(solidity);
 
 describe("Test of LoyaltyBridge", function () {

diff --git a/packages/relay/test/LoyaltyExchanger.test.ts b/packages/relay/test/LoyaltyExchanger.test.ts
@@ -18,14 +18,12 @@ import { solidity } from "ethereum-waffle";
 
 import fs from "fs";
 import * as path from "path";
+import URI from "urijs";
 import { URL } from "url";
 
 import { Wallet } from "ethers";
 import { ethers } from "hardhat";
 
-// tslint:disable-next-line:no-var-requires
-const URI = require("urijs");
-
 chai.use(solidity);
 
 describe("Test of LoyaltyExchanger", function () {

diff --git a/packages/relay/test/LoyaltyTransfer.test.ts b/packages/relay/test/LoyaltyTransfer.test.ts
@@ -14,11 +14,9 @@ import chai, { expect } from "chai";
 import { solidity } from "ethereum-waffle";
 
 import * as path from "path";
+import URI from "urijs";
 import { URL } from "url";
 
-// tslint:disable-next-line:no-var-requires
-const URI = require("urijs");
-
 chai.use(solidity);
 
 describe("Test of LoyaltyTransfer", function () {

diff --git a/packages/relay/test/Payment.test.ts b/packages/relay/test/Payment.test.ts
@@ -11,17 +11,7 @@ import { GraphStorage } from "../src/storage/GraphStorage";
 import { RelayStorage } from "../src/storage/RelayStorage";
 import { LoyaltyPaymentTaskStatus } from "../src/types";
 import { ContractUtils, LoyaltyNetworkID } from "../src/utils/ContractUtils";
-import {
-    BIP20DelegatedTransfer,
-    CurrencyRate,
-    Ledger,
-    LoyaltyConsumer,
-    LoyaltyExchanger,
-    LoyaltyProvider,
-    PhoneLinkCollection,
-    Shop,
-    Validator,
-} from "../typechain-types";
+import { Ledger, LoyaltyProvider, Shop } from "../typechain-types";
 import { Deployments } from "./helper/Deployments";
 import { FakerCallbackServer } from "./helper/FakerCallbackServer";
 import { getPurchaseId, TestClient, TestServer } from "./helper/Utility";
@@ -30,15 +20,13 @@ import chai, { expect } from "chai";
 import { solidity } from "ethereum-waffle";
 
 import * as assert from "assert";
-import { BigNumber, Wallet } from "ethers";
 import * as path from "path";
+import URI from "urijs";
 import { URL } from "url";
 
-// tslint:disable-next-line:no-implicit-dependencies
+import { BigNumber } from "@ethersproject/bignumber";
 import { AddressZero } from "@ethersproject/constants";
-
-// tslint:disable-next-line:no-var-requires
-const URI = require("urijs");
+import { Wallet } from "@ethersproject/wallet";
 
 chai.use(solidity);
 

diff --git a/packages/relay/test/ShopWithdraw.test.ts b/packages/relay/test/ShopWithdraw.test.ts
@@ -21,7 +21,6 @@ import path from "path";
 import URI from "urijs";
 import { URL } from "url";
 
-// tslint:disable-next-line:no-implicit-dependencies
 import { AddressZero } from "@ethersproject/constants";
 
 chai.use(solidity);

diff --git a/packages/relay/test/TempararyAccount.test.ts b/packages/relay/test/TempararyAccount.test.ts
@@ -19,15 +19,13 @@ import chai, { expect } from "chai";
 import { solidity } from "ethereum-waffle";
 
 import * as path from "path";
+import URI from "urijs";
 import { URL } from "url";
 
 import * as assert from "assert";
-import { BigNumber, Wallet } from "ethers";
 
-// tslint:disable-next-line:no-implicit-dependencies
 import { AddressZero } from "@ethersproject/constants";
-// tslint:disable-next-line:no-var-requires
-const URI = require("urijs");
+import { Wallet } from "@ethersproject/wallet";
 
 chai.use(solidity);