Skip to content

Commit 652fe6d

Browse files
abarmatabarmat
committed
vouchers: fix tests to use typechain v5 build paths
1 parent f09f9de commit 652fe6d

File tree

2 files changed

+22
-136
lines changed

2 files changed

+22
-136
lines changed

‎test/payments/allocationExchange.test.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { expect } from 'chai'
22
import { BigNumber, constants, Wallet } from 'ethers'
33

4-
import { AllocationExchange } from '../../build/typechain/contracts/AllocationExchange'
5-
import { GraphToken } from '../../build/typechain/contracts/GraphToken'
6-
import { Staking } from '../../build/typechain/contracts/Staking'
4+
import { AllocationExchange } from '../../build/types/AllocationExchange'
5+
import { GraphToken } from '../../build/types/GraphToken'
6+
import { Staking } from '../../build/types/Staking'
77

88
import { NetworkFixture } from '../lib/fixtures'
99
import * as deployment from '../lib/deployment'
@@ -58,14 +58,14 @@ describe('AllocationExchange', () => {
5858

5959
fixture = new NetworkFixture()
6060
;({ grt, staking } = await fixture.load(governor.signer))
61-
allocationExchange = ((await deployment.deployContract(
61+
allocationExchange = (await deployment.deployContract(
6262
'AllocationExchange',
6363
governor.signer,
6464
grt.address,
6565
staking.address,
6666
governor.address,
6767
authority.address,
68-
)) as unknown) as AllocationExchange
68+
)) as unknown as AllocationExchange
6969

7070
// Give some funds to the indexer and approve staking contract to use funds on indexer behalf
7171
const indexerTokens = toGRT('100000')

‎yarn.lock

Lines changed: 17 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -219,21 +219,6 @@
219219
"@ethersproject/properties" "^5.0.3"
220220
"@ethersproject/strings" "^5.0.4"
221221

222-
"@ethersproject/[email protected]":
223-
version "5.1.0"
224-
resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.1.0.tgz#d582c9f6a8e8192778b5f2c991ce19d7b336b0c5"
225-
integrity sha512-N/W9Sbn1/C6Kh2kuHRjf/hX6euMK4+9zdJRBB8sDWmihVntjUAfxbusGZKzDQD8i3szAHhTz8K7XADV5iFNfJw==
226-
dependencies:
227-
"@ethersproject/address" "^5.1.0"
228-
"@ethersproject/bignumber" "^5.1.0"
229-
"@ethersproject/bytes" "^5.1.0"
230-
"@ethersproject/constants" "^5.1.0"
231-
"@ethersproject/hash" "^5.1.0"
232-
"@ethersproject/keccak256" "^5.1.0"
233-
"@ethersproject/logger" "^5.1.0"
234-
"@ethersproject/properties" "^5.1.0"
235-
"@ethersproject/strings" "^5.1.0"
236-
237222
"@ethersproject/[email protected]", "@ethersproject/abi@^5.0.0-beta.146", "@ethersproject/abi@^5.0.1", "@ethersproject/abi@^5.0.2", "@ethersproject/abi@^5.1.0":
238223
version "5.1.2"
239224
resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.1.2.tgz#a8e75cd0455e6dc9e4861c3d1c22bbe436c1d775"
@@ -299,16 +284,7 @@
299284
"@ethersproject/bytes" "^5.1.0"
300285
"@ethersproject/properties" "^5.1.0"
301286

302-
"@ethersproject/[email protected]":
303-
version "5.1.0"
304-
resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.1.0.tgz#966a013a5d871fc03fc67bf33cd8aadae627f0fd"
305-
integrity sha512-wUvQlhTjPjFXIdLPOuTrFeQmSa6Wvls1bGXQNQWvB/SEn1NsTCE8PmumIEZxmOPjSHl1eV2uyHP5jBm5Cgj92Q==
306-
dependencies:
307-
"@ethersproject/bytes" "^5.1.0"
308-
"@ethersproject/logger" "^5.1.0"
309-
bn.js "^4.4.0"
310-
311-
"@ethersproject/[email protected]", "@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.1.0":
287+
"@ethersproject/[email protected]", "@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.1.0", "@ethersproject/bignumber@^5.1.1":
312288
version "5.1.1"
313289
resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.1.1.tgz#84812695253ccbc639117f7ac49ee1529b68e637"
314290
integrity sha512-AVz5iqz7+70RIqoQTznsdJ6DOVBYciNlvO+AlQmPTB6ofCvoihI9bQdr6wljsX+d5W7Yc4nyvQvP4JMzg0Agig==
@@ -331,23 +307,7 @@
331307
dependencies:
332308
"@ethersproject/bignumber" "^5.1.0"
333309

334-
"@ethersproject/[email protected]":
335-
version "5.1.0"
336-
resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.1.0.tgz#f7c3451f1af77e029005733ccab3419d07d23f6b"
337-
integrity sha512-dvTMs/4XGSc57cYOW0KjgX1NdTujUu7mNb6PQdJWg08m9ULzPyGZuBkFJnijBcp6vTOCQ59RwjboWgNWw393og==
338-
dependencies:
339-
"@ethersproject/abi" "^5.1.0"
340-
"@ethersproject/abstract-provider" "^5.1.0"
341-
"@ethersproject/abstract-signer" "^5.1.0"
342-
"@ethersproject/address" "^5.1.0"
343-
"@ethersproject/bignumber" "^5.1.0"
344-
"@ethersproject/bytes" "^5.1.0"
345-
"@ethersproject/constants" "^5.1.0"
346-
"@ethersproject/logger" "^5.1.0"
347-
"@ethersproject/properties" "^5.1.0"
348-
"@ethersproject/transactions" "^5.1.0"
349-
350-
"@ethersproject/[email protected]", "@ethersproject/contracts@^5.0.3", "@ethersproject/contracts@^5.1.1":
310+
"@ethersproject/[email protected]", "@ethersproject/contracts@^5.1.1":
351311
version "5.1.1"
352312
resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.1.1.tgz#c66cb6d618fcbd73e20a6b808e8f768b2b781d0b"
353313
integrity sha512-6WwktLJ0DFWU8pDkgH4IGttQHhQN4SnwKFu9h+QYVe48VGWtbDu4W8/q/7QA1u/HWlWMrKxqawPiZUJj0UMvOw==
@@ -458,31 +418,6 @@
458418
dependencies:
459419
"@ethersproject/logger" "^5.1.0"
460420

461-
"@ethersproject/[email protected]":
462-
version "5.1.0"
463-
resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.1.0.tgz#27695a02cfafa370428cde1c7a4abab13afb6a35"
464-
integrity sha512-FjpZL2lSXrYpQDg2fMjugZ0HjQD9a+2fOOoRhhihh+Z+qi/xZ8vIlPoumrEP1DzIG4DBV6liUqLNqnX2C6FIAA==
465-
dependencies:
466-
"@ethersproject/abstract-provider" "^5.1.0"
467-
"@ethersproject/abstract-signer" "^5.1.0"
468-
"@ethersproject/address" "^5.1.0"
469-
"@ethersproject/basex" "^5.1.0"
470-
"@ethersproject/bignumber" "^5.1.0"
471-
"@ethersproject/bytes" "^5.1.0"
472-
"@ethersproject/constants" "^5.1.0"
473-
"@ethersproject/hash" "^5.1.0"
474-
"@ethersproject/logger" "^5.1.0"
475-
"@ethersproject/networks" "^5.1.0"
476-
"@ethersproject/properties" "^5.1.0"
477-
"@ethersproject/random" "^5.1.0"
478-
"@ethersproject/rlp" "^5.1.0"
479-
"@ethersproject/sha2" "^5.1.0"
480-
"@ethersproject/strings" "^5.1.0"
481-
"@ethersproject/transactions" "^5.1.0"
482-
"@ethersproject/web" "^5.1.0"
483-
bech32 "1.1.4"
484-
ws "7.2.3"
485-
486421
"@ethersproject/[email protected]":
487422
version "5.1.2"
488423
resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.1.2.tgz#4e4459698903f911402fe91aa7544eb07f3921ed"
@@ -564,21 +499,6 @@
564499
"@ethersproject/constants" "^5.1.0"
565500
"@ethersproject/logger" "^5.1.0"
566501

567-
"@ethersproject/[email protected]":
568-
version "5.1.0"
569-
resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.1.0.tgz#da7fcd7e77e23dcfcca317a945f60bc228c61b36"
570-
integrity sha512-s10crRLZEA0Bgv6FGEl/AKkTw9f+RVUrlWDX1rHnD4ZncPFeiV2AJr4nT7QSUhxJdFPvjyKRDb3nEH27dIqcPQ==
571-
dependencies:
572-
"@ethersproject/address" "^5.1.0"
573-
"@ethersproject/bignumber" "^5.1.0"
574-
"@ethersproject/bytes" "^5.1.0"
575-
"@ethersproject/constants" "^5.1.0"
576-
"@ethersproject/keccak256" "^5.1.0"
577-
"@ethersproject/logger" "^5.1.0"
578-
"@ethersproject/properties" "^5.1.0"
579-
"@ethersproject/rlp" "^5.1.0"
580-
"@ethersproject/signing-key" "^5.1.0"
581-
582502
"@ethersproject/[email protected]", "@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.1.0", "@ethersproject/transactions@^5.1.1":
583503
version "5.1.1"
584504
resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.1.1.tgz#5a6bbb25fb062c3cc75eb0db12faefcdd3870813"
@@ -646,20 +566,23 @@
646566
"@ethersproject/properties" "^5.1.0"
647567
"@ethersproject/strings" "^5.1.0"
648568

649-
"@graphprotocol/common-ts@^1.5.0":
650-
version "1.5.0"
651-
resolved "https://registry.yarnpkg.com/@graphprotocol/common-ts/-/common-ts-1.5.0.tgz#6faaf0888330adff200d4d3aedbb377981a28e9f"
652-
integrity sha512-Wwfc8YovgcYmr/KCMtaPXJev5FjZTIhayEmeLt7x761odbpk0X+2vTVxMcTSI/cKeBLueSF9NmB/Q8OyY4ByBw==
569+
"@graphprotocol/common-ts@^1.6.0":
570+
version "1.6.0"
571+
resolved "https://registry.yarnpkg.com/@graphprotocol/common-ts/-/common-ts-1.6.0.tgz#b8ee56ae8abad2c836423d5d43bc250f0f2d69e7"
572+
integrity sha512-3O8yR+XpmZRbb6TFGLoKCwEWftRrUpSKSMZ7d3p+AdqN7xaFBSZvBk8XbzeoMLvLCnYO7mid0VWGWE7FC3yDjA==
653573
dependencies:
654-
"@graphprotocol/contracts" "1.2.0"
574+
"@ethersproject/bignumber" "^5.1.1"
575+
"@ethersproject/contracts" "^5.1.1"
576+
"@ethersproject/transactions" "^5.1.1"
577+
"@graphprotocol/contracts" "1.4.0"
655578
"@graphprotocol/pino-sentry-simple" "0.7.1"
656579
"@urql/core" "1.13.1"
657580
"@urql/exchange-execute" "1.0.1"
658581
body-parser "1.19.0"
659582
bs58 "4.0.1"
660583
cors "2.8.5"
661584
cross-fetch "3.0.6"
662-
ethers "5.1.0"
585+
ethers "^5.1.3"
663586
express "4.17.1"
664587
graphql "15.4.0"
665588
graphql-tag "2.11.0"
@@ -673,13 +596,12 @@
673596
prom-client "12.0.0"
674597
sequelize "6.3.5"
675598

676-
"@graphprotocol/contracts@1.2.0":
677-
version "1.2.0"
678-
resolved "https://registry.yarnpkg.com/@graphprotocol/contracts/-/contracts-1.2.0.tgz#72e080aa6a9eae874c8c63b45f74a0e36aa328ae"
679-
integrity sha512-h8BDkv/41f5oEYEs0z66lTZW+VfEENKGnFP7xVCavV3NOZxoTI5sPvlO+FPCtakeIWxUcWM8+ayx8hzIKrR+aQ==
599+
"@graphprotocol/contracts@1.4.0":
600+
version "1.4.0"
601+
resolved "https://registry.yarnpkg.com/@graphprotocol/contracts/-/contracts-1.4.0.tgz#7271e83e3444c08663216e91899ffc0d98fc1ff5"
602+
integrity sha512-DvUtcOXlAREzcBW4tROpFdQNGTDqcCeNvhGuX2s+6C1znr6kDVDgIrXmKJ+ofGRzJxCNe3QAtlPdFg00IQL25w==
680603
dependencies:
681-
"@ethersproject/contracts" "^5.0.3"
682-
ethers "^5.0.9"
604+
ethers "^5.1.3"
683605

684606
"@graphprotocol/[email protected]":
685607
version "0.7.1"
@@ -4500,42 +4422,6 @@ [email protected]:
45004422
utf8 "^3.0.0"
45014423
uuid "^3.3.2"
45024424

4503-
[email protected]:
4504-
version "5.1.0"
4505-
resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.1.0.tgz#8a8758e0b6cbbc19fd4b87f4d551170fa6f1a995"
4506-
integrity sha512-2L6Ge6wMBw02FlRoCLg4E0Elt3khMNlW6ULawa10mMeeZToYJ5+uCfiuTuB+XZ6om1Y7wuO9ZzezP8FsU2M/+g==
4507-
dependencies:
4508-
"@ethersproject/abi" "5.1.0"
4509-
"@ethersproject/abstract-provider" "5.1.0"
4510-
"@ethersproject/abstract-signer" "5.1.0"
4511-
"@ethersproject/address" "5.1.0"
4512-
"@ethersproject/base64" "5.1.0"
4513-
"@ethersproject/basex" "5.1.0"
4514-
"@ethersproject/bignumber" "5.1.0"
4515-
"@ethersproject/bytes" "5.1.0"
4516-
"@ethersproject/constants" "5.1.0"
4517-
"@ethersproject/contracts" "5.1.0"
4518-
"@ethersproject/hash" "5.1.0"
4519-
"@ethersproject/hdnode" "5.1.0"
4520-
"@ethersproject/json-wallets" "5.1.0"
4521-
"@ethersproject/keccak256" "5.1.0"
4522-
"@ethersproject/logger" "5.1.0"
4523-
"@ethersproject/networks" "5.1.0"
4524-
"@ethersproject/pbkdf2" "5.1.0"
4525-
"@ethersproject/properties" "5.1.0"
4526-
"@ethersproject/providers" "5.1.0"
4527-
"@ethersproject/random" "5.1.0"
4528-
"@ethersproject/rlp" "5.1.0"
4529-
"@ethersproject/sha2" "5.1.0"
4530-
"@ethersproject/signing-key" "5.1.0"
4531-
"@ethersproject/solidity" "5.1.0"
4532-
"@ethersproject/strings" "5.1.0"
4533-
"@ethersproject/transactions" "5.1.0"
4534-
"@ethersproject/units" "5.1.0"
4535-
"@ethersproject/wallet" "5.1.0"
4536-
"@ethersproject/web" "5.1.0"
4537-
"@ethersproject/wordlists" "5.1.0"
4538-
45394425
ethers@^4.0.32, ethers@^4.0.40:
45404426
version "4.0.48"
45414427
resolved "https://registry.yarnpkg.com/ethers/-/ethers-4.0.48.tgz#330c65b8133e112b0613156e57e92d9009d8fbbe"
@@ -4551,7 +4437,7 @@ ethers@^4.0.32, ethers@^4.0.40:
45514437
uuid "2.0.1"
45524438
xmlhttprequest "1.8.0"
45534439

4554-
ethers@^5.0.0, ethers@^5.0.1, ethers@^5.0.2, ethers@^5.0.9, ethers@^5.1.0, ethers@^5.1.3:
4440+
ethers@^5.0.0, ethers@^5.0.1, ethers@^5.0.2, ethers@^5.1.0, ethers@^5.1.3:
45554441
version "5.1.4"
45564442
resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.1.4.tgz#8ae973705ed962f8f41dc59693704002a38dd18b"
45574443
integrity sha512-EAPQ/fgGRu0PoR/VNFnHTMOtG/IZ0AItdW55C9T8ffmVu0rnyllZL404eBF66elJehOLz2kxnUrhXpE7TCpW7g==

0 commit comments

Comments
 (0)