Skip to content

Commit 3506fdf

Browse files
tomaszslabontomaszslabon
committed
Used hardhat-helpers in random beacon
1 parent 535aa4e commit 3506fdf

File tree

5 files changed

+32
-37
lines changed

5 files changed

+32
-37
lines changed

‎solidity/random-beacon/hardhat.config.ts

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { HardhatUserConfig } from "hardhat/config"
22

33
import "@keep-network/hardhat-local-networks-config"
4+
import "@keep-network/hardhat-helpers"
45
import "hardhat-deploy"
56
import "@tenderly/hardhat-tenderly"
67
import "@nomiclabs/hardhat-waffle"

‎solidity/random-beacon/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,14 @@
1212
"@thesis/solidity-contracts": "github:thesis/solidity-contracts#4985bcf"
1313
},
1414
"devDependencies": {
15+
"@keep-network/hardhat-helpers": "https://github.com/keep-network/hardhat-helpers#ed35ab7",
1516
"@keep-network/hardhat-local-networks-config": "^0.1.0-pre.0",
1617
"@nomiclabs/hardhat-ethers": "^2.0.2",
1718
"@nomiclabs/hardhat-waffle": "^2.0.1",
19+
"@tenderly/hardhat-tenderly": "^1.0.12",
1820
"@types/chai": "^4.2.22",
1921
"@types/mocha": "^9.0.0",
2022
"@types/node": "^16.9.6",
21-
"@tenderly/hardhat-tenderly": "^1.0.12",
2223
"chai": "^4.3.4",
2324
"eslint": "^7.30.0",
2425
"eslint-config-keep": "github:keep-network/eslint-config-keep#0c27ade",

‎solidity/random-beacon/test/RandomBeaconGovernance.test.ts

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ethers } from "hardhat"
22
import { Signer, Contract } from "ethers"
33
import { expect } from "chai"
4-
import { increaseTime } from "./helpers/contract-test-helpers"
4+
import { helpers } from "hardhat"
55

66
describe("RandomBeaconGovernance", () => {
77
let governance: Signer
@@ -95,7 +95,7 @@ describe("RandomBeaconGovernance", () => {
9595
.connect(governance)
9696
.beginRelayRequestFeeUpdate(123)
9797

98-
await increaseTime(23 * 60 * 60) // 23 hours
98+
await helpers.time.increaseTime(23 * 60 * 60) // 23 hours
9999

100100
await expect(
101101
randomBeaconGovernance
@@ -113,7 +113,7 @@ describe("RandomBeaconGovernance", () => {
113113
.connect(governance)
114114
.beginRelayRequestFeeUpdate(123)
115115

116-
await increaseTime(24 * 60 * 60) // 24 hours
116+
await helpers.time.increaseTime(24 * 60 * 60) // 24 hours
117117

118118
tx = await randomBeaconGovernance
119119
.connect(governance)
@@ -208,7 +208,7 @@ describe("RandomBeaconGovernance", () => {
208208
.connect(governance)
209209
.beginDkgResultSubmissionRewardUpdate(123)
210210

211-
await increaseTime(23 * 60 * 60) // 23 hours
211+
await helpers.time.increaseTime(23 * 60 * 60) // 23 hours
212212

213213
await expect(
214214
randomBeaconGovernance
@@ -226,7 +226,7 @@ describe("RandomBeaconGovernance", () => {
226226
.connect(governance)
227227
.beginDkgResultSubmissionRewardUpdate(123)
228228

229-
await increaseTime(24 * 60 * 60)
229+
await helpers.time.increaseTime(24 * 60 * 60) // 24 hours
230230

231231
tx = await randomBeaconGovernance
232232
.connect(governance)
@@ -321,7 +321,7 @@ describe("RandomBeaconGovernance", () => {
321321
.connect(governance)
322322
.beginSortitionPoolUnlockingRewardUpdate(123)
323323

324-
await increaseTime(23 * 60 * 60) // 23 hours
324+
await helpers.time.increaseTime(23 * 60 * 60) // 23 hours
325325

326326
await expect(
327327
randomBeaconGovernance
@@ -339,7 +339,7 @@ describe("RandomBeaconGovernance", () => {
339339
.connect(governance)
340340
.beginSortitionPoolUnlockingRewardUpdate(123)
341341

342-
await increaseTime(24 * 60 * 60) // 24 hours
342+
await helpers.time.increaseTime(24 * 60 * 60) // 24 hours
343343

344344
tx = await randomBeaconGovernance
345345
.connect(governance)
@@ -441,7 +441,7 @@ describe("RandomBeaconGovernance", () => {
441441
.connect(governance)
442442
.beginRelayEntrySubmissionFailureSlashingAmountUpdate(123)
443443

444-
await increaseTime(13 * 24 * 60 * 60) // 13 days
444+
await helpers.time.increaseTime(13 * 24 * 60 * 60) // 13 days
445445

446446
await expect(
447447
randomBeaconGovernance
@@ -459,7 +459,7 @@ describe("RandomBeaconGovernance", () => {
459459
.connect(governance)
460460
.beginRelayEntrySubmissionFailureSlashingAmountUpdate(123)
461461

462-
await increaseTime(14 * 24 * 60 * 60) // 2 weeks
462+
await helpers.time.increaseTime(14 * 24 * 60 * 60) // 2 weeks
463463

464464
tx = await randomBeaconGovernance
465465
.connect(governance)
@@ -561,7 +561,7 @@ describe("RandomBeaconGovernance", () => {
561561
.connect(governance)
562562
.beginMaliciousDkgResultSlashingAmountUpdate(123)
563563

564-
await increaseTime(23 * 60 * 60) // 23 hours
564+
await helpers.time.increaseTime(23 * 60 * 60) // 23 hours
565565

566566
await expect(
567567
randomBeaconGovernance
@@ -579,7 +579,7 @@ describe("RandomBeaconGovernance", () => {
579579
.connect(governance)
580580
.beginMaliciousDkgResultSlashingAmountUpdate(123)
581581

582-
await increaseTime(24 * 60 * 60) // 24 hours
582+
await helpers.time.increaseTime(24 * 60 * 60) // 24 hours
583583

584584
tx = await randomBeaconGovernance
585585
.connect(governance)
@@ -693,7 +693,7 @@ describe("RandomBeaconGovernance", () => {
693693
.connect(governance)
694694
.beginDkgResultChallengePeriodLengthUpdate(11)
695695

696-
await increaseTime(23 * 60 * 60) // 23 hours
696+
await helpers.time.increaseTime(23 * 60 * 60) // 23 hours
697697

698698
await expect(
699699
randomBeaconGovernance
@@ -711,7 +711,7 @@ describe("RandomBeaconGovernance", () => {
711711
.connect(governance)
712712
.beginDkgResultChallengePeriodLengthUpdate(11)
713713

714-
await increaseTime(24 * 60 * 60) // 24 hours
714+
await helpers.time.increaseTime(24 * 60 * 60) // 24 hours
715715

716716
tx = await randomBeaconGovernance
717717
.connect(governance)
@@ -825,7 +825,7 @@ describe("RandomBeaconGovernance", () => {
825825
.connect(governance)
826826
.beginRelayEntrySubmissionEligibilityDelayUpdate(1)
827827

828-
await increaseTime(23 * 60 * 60) // 23 hours
828+
await helpers.time.increaseTime(23 * 60 * 60) // 23 hours
829829

830830
await expect(
831831
randomBeaconGovernance
@@ -843,7 +843,7 @@ describe("RandomBeaconGovernance", () => {
843843
.connect(governance)
844844
.beginRelayEntrySubmissionEligibilityDelayUpdate(1)
845845

846-
await increaseTime(24 * 60 * 60) // 24 hours
846+
await helpers.time.increaseTime(24 * 60 * 60) // 24 hours
847847

848848
tx = await randomBeaconGovernance
849849
.connect(governance)
@@ -957,7 +957,7 @@ describe("RandomBeaconGovernance", () => {
957957
.connect(governance)
958958
.beginDkgSubmissionEligibilityDelayUpdate(1)
959959

960-
await increaseTime(23 * 60 * 60) // 23 hours
960+
await helpers.time.increaseTime(23 * 60 * 60) // 23 hours
961961

962962
await expect(
963963
randomBeaconGovernance
@@ -975,7 +975,7 @@ describe("RandomBeaconGovernance", () => {
975975
.connect(governance)
976976
.beginDkgSubmissionEligibilityDelayUpdate(1)
977977

978-
await increaseTime(24 * 60 * 60) // 24 hours
978+
await helpers.time.increaseTime(24 * 60 * 60) // 24 hours
979979

980980
tx = await randomBeaconGovernance
981981
.connect(governance)
@@ -1072,7 +1072,7 @@ describe("RandomBeaconGovernance", () => {
10721072
.connect(governance)
10731073
.beginRelayEntryHardTimeoutUpdate(123)
10741074

1075-
await increaseTime(13 * 24 * 60 * 60) // 13 days
1075+
await helpers.time.increaseTime(13 * 24 * 60 * 60) // 13 days
10761076

10771077
await expect(
10781078
randomBeaconGovernance
@@ -1090,7 +1090,7 @@ describe("RandomBeaconGovernance", () => {
10901090
.connect(governance)
10911091
.beginRelayEntryHardTimeoutUpdate(123)
10921092

1093-
await increaseTime(14 * 24 * 60 * 60) // 2 weeks
1093+
await helpers.time.increaseTime(14 * 24 * 60 * 60) // 2 weeks
10941094

10951095
tx = await randomBeaconGovernance
10961096
.connect(governance)
@@ -1197,7 +1197,7 @@ describe("RandomBeaconGovernance", () => {
11971197
.connect(governance)
11981198
.beginGroupCreationFrequencyUpdate(1)
11991199

1200-
await increaseTime(13 * 24 * 60 * 60) // 13 days
1200+
await helpers.time.increaseTime(13 * 24 * 60 * 60) // 13 days
12011201

12021202
await expect(
12031203
randomBeaconGovernance
@@ -1215,7 +1215,7 @@ describe("RandomBeaconGovernance", () => {
12151215
.connect(governance)
12161216
.beginGroupCreationFrequencyUpdate(1)
12171217

1218-
await increaseTime(14 * 24 * 60 * 60) // 2 weeks
1218+
await helpers.time.increaseTime(14 * 24 * 60 * 60) // 2 weeks
12191219

12201220
tx = await randomBeaconGovernance
12211221
.connect(governance)
@@ -1327,7 +1327,7 @@ describe("RandomBeaconGovernance", () => {
13271327
.connect(governance)
13281328
.beginGroupLifetimeUpdate(2 * 24 * 60 * 60) // 2 days
13291329

1330-
await increaseTime(13 * 24 * 60 * 60) // 13 days
1330+
await helpers.time.increaseTime(13 * 24 * 60 * 60) // 13 days
13311331

13321332
await expect(
13331333
randomBeaconGovernance
@@ -1345,7 +1345,7 @@ describe("RandomBeaconGovernance", () => {
13451345
.connect(governance)
13461346
.beginGroupLifetimeUpdate(2 * 24 * 60 * 60) // 2 days
13471347

1348-
await increaseTime(14 * 24 * 60 * 60) // 2 weeks
1348+
await helpers.time.increaseTime(14 * 24 * 60 * 60) // 2 weeks
13491349

13501350
tx = await randomBeaconGovernance
13511351
.connect(governance)
@@ -1457,7 +1457,7 @@ describe("RandomBeaconGovernance", () => {
14571457
.connect(governance)
14581458
.beginCallbackGasLimitUpdate(123)
14591459

1460-
await increaseTime(13 * 24 * 60 * 60) // 13 days
1460+
await helpers.time.increaseTime(13 * 24 * 60 * 60) // 13 days
14611461

14621462
await expect(
14631463
randomBeaconGovernance
@@ -1475,7 +1475,7 @@ describe("RandomBeaconGovernance", () => {
14751475
.connect(governance)
14761476
.beginCallbackGasLimitUpdate(123)
14771477

1478-
await increaseTime(14 * 24 * 60 * 60) // 2 weeks
1478+
await helpers.time.increaseTime(14 * 24 * 60 * 60) // 2 weeks
14791479

14801480
tx = await randomBeaconGovernance
14811481
.connect(governance)

‎solidity/random-beacon/test/helpers/contract-test-helpers.ts

-11
This file was deleted.

‎solidity/random-beacon/yarn.lock

+4
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,10 @@
557557
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
558558
integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
559559

560+
"@keep-network/hardhat-helpers@https://github.com/keep-network/hardhat-helpers#ed35ab7":
561+
version "0.2.0-pre.2"
562+
resolved "https://github.com/keep-network/hardhat-helpers#ed35ab741bede1730333217922065f65a997f840"
563+
560564
"@keep-network/hardhat-local-networks-config@^0.1.0-pre.0":
561565
version "0.1.0-pre.0"
562566
resolved "https://registry.yarnpkg.com/@keep-network/hardhat-local-networks-config/-/hardhat-local-networks-config-0.1.0-pre.0.tgz#55ab2f524f3bc5ad094d878c74644a0f77054396"

0 commit comments

Comments
 (0)