Эх сурвалжийг харах

refactor: use Signer instead of Wallet class in tests

see https://github.com/EthWorks/Waffle/issues/308
Paul Razvan Berg 5 жил өмнө
parent
commit
30273216ea
4 өөрчлөгдсөн 8 нэмэгдсэн , 29 устгасан
  1. 0 1
      package.json
  2. 3 3
      test/Greeter.behavior.ts
  3. 5 4
      test/Greeter.ts
  4. 0 21
      yarn.lock

+ 0 - 1
package.json

@@ -14,7 +14,6 @@
     "@commitlint/config-conventional": "^9.0.1",
     "@ethersproject/abstract-signer": "^5.0.1",
     "@ethersproject/bignumber": "^5.0.3",
-    "@ethersproject/wallet": "^5.0.1",
     "@nomiclabs/buidler": "^1.3.8",
     "@nomiclabs/buidler-ethers": "^2.0.0",
     "@nomiclabs/buidler-waffle": "^2.0.0",

+ 3 - 3
test/Greeter.behavior.ts

@@ -1,8 +1,8 @@
-import { Wallet } from "@ethersproject/wallet";
+import { Signer } from "@ethersproject/abstract-signer";
 import { expect } from "chai";
 
-export function shouldBehaveLikeGreeter(_wallets: Wallet[]): void {
-  it("Should return the new greeting once it's changed", async function () {
+export function shouldBehaveLikeGreeter(_signers: Signer[]): void {
+  it("should return the new greeting once it's changed", async function () {
     expect(await this.greeter.greet()).to.equal("Hello, world!");
 
     await this.greeter.setGreeting("Hola, mundo!");

+ 5 - 4
test/Greeter.ts

@@ -1,5 +1,5 @@
 import chai from "chai";
-import { Wallet } from "@ethersproject/wallet";
+import { Signer } from "@ethersproject/abstract-signer";
 import { deployContract, solidity } from "ethereum-waffle";
 import { ethers } from "@nomiclabs/buidler";
 
@@ -11,15 +11,16 @@ import { shouldBehaveLikeGreeter } from "./Greeter.behavior";
 chai.use(solidity);
 
 setTimeout(async function () {
-  const wallets = (await ethers.getSigners()) as Wallet[];
+  const signers: Signer[] = await ethers.getSigners();
+  const admin: Signer = signers[0];
 
   describe("Greeter", function () {
     beforeEach(async function () {
       const greeting: string = "Hello, world!";
-      this.greeter = (await deployContract(wallets[0], GreeterArtifact, [greeting])) as Greeter;
+      this.greeter = (await deployContract(admin, GreeterArtifact, [greeting])) as Greeter;
     });
 
-    shouldBehaveLikeGreeter(wallets);
+    shouldBehaveLikeGreeter(signers);
   });
 
   run();

+ 0 - 21
yarn.lock

@@ -574,27 +574,6 @@
     "@ethersproject/transactions" "^5.0.0"
     "@ethersproject/wordlists" "^5.0.0"
 
-"@ethersproject/wallet@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/@ethersproject/wallet/-/wallet-5.0.1.tgz#595077365c674654e90d3884594a86d70ba07e7e"
-  integrity sha512-1/QPpFngJtUGtdVOLSoIN3vf+zEWyEVxQ0lhRCwGkiBqL2SoVoDHB7/nCfcv7wwlZkdnegFfo/8DxeyYjTZN7w==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.0.0"
-    "@ethersproject/abstract-signer" "^5.0.0"
-    "@ethersproject/address" "^5.0.0"
-    "@ethersproject/bignumber" "^5.0.0"
-    "@ethersproject/bytes" "^5.0.0"
-    "@ethersproject/hash" "^5.0.0"
-    "@ethersproject/hdnode" "^5.0.0"
-    "@ethersproject/json-wallets" "^5.0.0"
-    "@ethersproject/keccak256" "^5.0.0"
-    "@ethersproject/logger" "^5.0.0"
-    "@ethersproject/properties" "^5.0.0"
-    "@ethersproject/random" "^5.0.0"
-    "@ethersproject/signing-key" "^5.0.0"
-    "@ethersproject/transactions" "^5.0.0"
-    "@ethersproject/wordlists" "^5.0.0"
-
 "@ethersproject/web@^5.0.0":
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.3.tgz#f5673923009bb855302f0296ddb932da8e42f0a1"