From ace937c3adfe2617dfa75e907325055594e307b5 Mon Sep 17 00:00:00 2001 From: rymnc <43716372+rymnc@users.noreply.github.com> Date: Thu, 3 Aug 2023 18:27:46 +0530 Subject: [PATCH] fix: move noDuplicate into utils --- test/WakuRln.t.sol | 13 +------------ test/WakuRlnRegistry.t.sol | 4 ++-- test/utils.sol | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 test/utils.sol diff --git a/test/WakuRln.t.sol b/test/WakuRln.t.sol index 12cdd5b..66445b2 100644 --- a/test/WakuRln.t.sol +++ b/test/WakuRln.t.sol @@ -2,22 +2,11 @@ pragma solidity ^0.8.15; import {PoseidonHasher} from "rln-contract/PoseidonHasher.sol"; +import "./utils.sol"; import "../contracts/WakuRLn.sol"; import "forge-std/Test.sol"; import "forge-std/StdCheats.sol"; -function noDuplicate(uint256[] calldata ids) pure returns (bool) { - uint256 len = ids.length; - for (uint256 i = 0; i < len; i++) { - for (uint256 j = i + 1; j < len; j++) { - if (ids[i] == ids[j]) { - return false; - } - } - } - return true; -} - contract WakuRlnTest is Test { using stdStorage for StdStorage; diff --git a/test/WakuRlnRegistry.t.sol b/test/WakuRlnRegistry.t.sol index 60f73d9..415c4b3 100644 --- a/test/WakuRlnRegistry.t.sol +++ b/test/WakuRlnRegistry.t.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: MIT pragma solidity ^0.8.15; -import {PoseidonHasher} from "rln-contract/PoseidonHasher.sol"; import "../contracts/WakuRlnRegistry.sol"; -import {noDuplicate} from "./WakuRln.t.sol"; +import {PoseidonHasher} from "rln-contract/PoseidonHasher.sol"; import {DuplicateIdCommitment} from "rln-contract/RlnBase.sol"; +import {noDuplicate} from "./utils.sol"; import "forge-std/Test.sol"; import "forge-std/StdCheats.sol"; diff --git a/test/utils.sol b/test/utils.sol new file mode 100644 index 0000000..fe2ebb2 --- /dev/null +++ b/test/utils.sol @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.15; + +function noDuplicate(uint256[] calldata ids) pure returns (bool) { + uint256 len = ids.length; + for (uint256 i = 0; i < len; i++) { + for (uint256 j = i + 1; j < len; j++) { + if (ids[i] == ids[j]) { + return false; + } + } + } + return true; +}