Skip to content

Commit c286fff

Browse files
ItsNickBarryItsNickBarry
committed
remove cryptography mocks
1 parent 70e55c5 commit c286fff

File tree

6 files changed

+52
-92
lines changed

6 files changed

+52
-92
lines changed

‎contracts/cryptography/ECDSAMock.sol

-29
This file was deleted.

‎contracts/cryptography/EIP712Mock.sol

-14
This file was deleted.

‎contracts/cryptography/MerkleProofMock.sol

-15
This file was deleted.

‎test/cryptography/ECDSA.ts

+27-22
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
11
import { hashData, signData } from '@solidstate/library';
2-
import { ECDSAMock, ECDSAMock__factory } from '@solidstate/typechain-types';
2+
import {
3+
__hh_exposed_ECDSA,
4+
__hh_exposed_ECDSA__factory,
5+
} from '@solidstate/typechain-types';
36
import { expect } from 'chai';
47
import { ethers } from 'hardhat';
58

69
const MAX_S_VALUE =
710
'0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5D576E7357A4501DDFE92F46681B20A0';
811

912
describe('ECDSA', () => {
10-
let instance: ECDSAMock;
13+
let instance: __hh_exposed_ECDSA;
1114

1215
beforeEach(async () => {
1316
const [deployer] = await ethers.getSigners();
14-
instance = await new ECDSAMock__factory(deployer).deploy();
17+
instance = await new __hh_exposed_ECDSA__factory(deployer).deploy();
1518
});
1619

1720
describe('__internal', () => {
@@ -30,7 +33,7 @@ describe('ECDSA', () => {
3033
const sig = await signData(signer, data);
3134

3235
expect(
33-
await instance['recover(bytes32,bytes)'].staticCall(
36+
await instance['__hh_exposed_recover(bytes32,bytes)'].staticCall(
3437
ethers.solidityPackedKeccak256(
3538
['string', 'bytes32'],
3639
['\x19Ethereum Signed Message:\n32', hash],
@@ -43,7 +46,7 @@ describe('ECDSA', () => {
4346
describe('reverts if', () => {
4447
it('signaure length is invalid', async () => {
4548
await expect(
46-
instance['recover(bytes32,bytes)'].staticCall(
49+
instance['__hh_exposed_recover(bytes32,bytes)'].staticCall(
4750
ethers.randomBytes(32),
4851
ethers.randomBytes(64),
4952
),
@@ -53,7 +56,7 @@ describe('ECDSA', () => {
5356
);
5457

5558
await expect(
56-
instance['recover(bytes32,bytes)'].staticCall(
59+
instance['__hh_exposed_recover(bytes32,bytes)'].staticCall(
5760
ethers.randomBytes(32),
5861
ethers.randomBytes(66),
5962
),
@@ -84,7 +87,9 @@ describe('ECDSA', () => {
8487
const v = ethers.dataSlice(sig, 64, 65);
8588

8689
expect(
87-
await instance['recover(bytes32,uint8,bytes32,bytes32)'].staticCall(
90+
await instance[
91+
'__hh_exposed_recover(bytes32,uint8,bytes32,bytes32)'
92+
].staticCall(
8893
ethers.solidityPackedKeccak256(
8994
['string', 'bytes32'],
9095
['\x19Ethereum Signed Message:\n32', hash],
@@ -105,7 +110,9 @@ describe('ECDSA', () => {
105110
// s must be less than or equal to MAX_S_VALUE
106111

107112
await expect(
108-
instance['recover(bytes32,uint8,bytes32,bytes32)'].staticCall(
113+
instance[
114+
'__hh_exposed_recover(bytes32,uint8,bytes32,bytes32)'
115+
].staticCall(
109116
hash,
110117
v,
111118
r,
@@ -123,23 +130,17 @@ describe('ECDSA', () => {
123130

124131
for (let v = 0; v <= 26; v++) {
125132
await expect(
126-
instance['recover(bytes32,uint8,bytes32,bytes32)'].staticCall(
127-
hash,
128-
v,
129-
r,
130-
s,
131-
),
133+
instance[
134+
'__hh_exposed_recover(bytes32,uint8,bytes32,bytes32)'
135+
].staticCall(hash, v, r, s),
132136
).to.be.revertedWithCustomError(instance, 'ECDSA__InvalidV');
133137
}
134138

135139
for (let v = 29; v <= 255; v++) {
136140
await expect(
137-
instance['recover(bytes32,uint8,bytes32,bytes32)'].staticCall(
138-
hash,
139-
v,
140-
r,
141-
s,
142-
),
141+
instance[
142+
'__hh_exposed_recover(bytes32,uint8,bytes32,bytes32)'
143+
].staticCall(hash, v, r, s),
143144
).to.be.revertedWithCustomError(instance, 'ECDSA__InvalidV');
144145
}
145146
});
@@ -151,7 +152,9 @@ describe('ECDSA', () => {
151152
// hash and r generated randomly, known not to yield valid signer
152153

153154
await expect(
154-
instance['recover(bytes32,uint8,bytes32,bytes32)'].staticCall(
155+
instance[
156+
'__hh_exposed_recover(bytes32,uint8,bytes32,bytes32)'
157+
].staticCall(
155158
'0xfb78d190a6ff9c55a28ae24c65cb006029ae15140557db9017a6474592d3fd59',
156159
v,
157160
'0xe1a6fa655db25741b29a03d2f8ec44fb5590d0a1ce91c789886b59e54c08f509',
@@ -166,7 +169,9 @@ describe('ECDSA', () => {
166169
it('returns hash of signed message prefix and message', async () => {
167170
const hash = ethers.keccak256(ethers.toUtf8Bytes('test'));
168171

169-
expect(await instance.toEthSignedMessageHash.staticCall(hash)).to.equal(
172+
expect(
173+
await instance.__hh_exposed_toEthSignedMessageHash.staticCall(hash),
174+
).to.equal(
170175
ethers.solidityPackedKeccak256(
171176
['string', 'bytes32'],
172177
['\x19Ethereum Signed Message:\n32', hash],

‎test/cryptography/EIP712.ts

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
import { hashData, signData } from '@solidstate/library';
2-
import { EIP712Mock, EIP712Mock__factory } from '@solidstate/typechain-types';
2+
import {
3+
EXPOSEDEIP712,
4+
EXPOSEDEIP712__factory,
5+
} from '@solidstate/typechain-types';
36
import { expect } from 'chai';
47
import { ethers } from 'hardhat';
58

69
describe('EIP712', () => {
7-
let instance: EIP712Mock;
10+
let instance: EXPOSEDEIP712;
811

912
beforeEach(async () => {
1013
const [deployer] = await ethers.getSigners();
11-
instance = await new EIP712Mock__factory(deployer).deploy();
14+
instance = await new EXPOSEDEIP712__factory(deployer).deploy();
1215
});
1316

1417
describe('__internal', () => {
@@ -42,7 +45,7 @@ describe('EIP712', () => {
4245
);
4346

4447
expect(
45-
await instance.calculateDomainSeparator.staticCall(
48+
await instance.EXPOSEDcalculateDomainSeparator.staticCall(
4649
nameHash,
4750
versionHash,
4851
),

‎test/cryptography/MerkleProof.ts

+18-8
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
import {
2-
MerkleProofMock,
3-
MerkleProofMock__factory,
2+
__hh_exposed_MerkleProof,
3+
__hh_exposed_MerkleProof__factory,
44
} from '@solidstate/typechain-types';
55
import { expect } from 'chai';
66
import { ethers } from 'hardhat';
77
import keccak256 from 'keccak256';
88
import { MerkleTree } from 'merkletreejs';
99

1010
describe('MerkleProof', () => {
11-
let instance: MerkleProofMock;
11+
let instance: __hh_exposed_MerkleProof;
1212

1313
beforeEach(async () => {
1414
const [deployer] = await ethers.getSigners();
15-
instance = await new MerkleProofMock__factory(deployer).deploy();
15+
instance = await new __hh_exposed_MerkleProof__factory(deployer).deploy();
1616
});
1717

1818
describe('__internal', () => {
@@ -28,8 +28,13 @@ describe('MerkleProof', () => {
2828
for (const leaf of leaves) {
2929
const proof = tree.getHexProof(keccak256(leaf));
3030

31-
expect(await instance.verify.staticCall(proof, root, keccak256(leaf)))
32-
.to.be.true;
31+
expect(
32+
await instance.__hh_exposed_verify.staticCall(
33+
proof,
34+
root,
35+
keccak256(leaf),
36+
),
37+
).to.be.true;
3338
}
3439
});
3540

@@ -43,8 +48,13 @@ describe('MerkleProof', () => {
4348

4449
const proof = tree.getHexProof(keccak256(leaves[0]));
4550

46-
expect(await instance.verify.staticCall(proof, root, keccak256('4'))).to
47-
.be.false;
51+
expect(
52+
await instance.__hh_exposed_verify.staticCall(
53+
proof,
54+
root,
55+
keccak256('4'),
56+
),
57+
).to.be.false;
4858
});
4959
});
5060
});

0 commit comments

Comments
 (0)