Skip to content

Commit

Permalink
fix naming
Browse files Browse the repository at this point in the history
  • Loading branch information
Arvolear committed Nov 26, 2024
1 parent 1145a76 commit 7922924
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions contracts/certificate/signers/CECDSA384Signer.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {SHA384} from "../../utils/SHA384.sol";
/**
* @notice Forked from https://github.com/tdrerup/elliptic-curve-solidity/blob/master/contracts/curves/EllipticCurve.sol
*/
contract CECDSASHA2Signer is ICertificateSigner, Initializable {
contract CECDSA384Signer is ICertificateSigner, Initializable {
using ECDSA384 for *;
using SHA384 for *;

Expand Down Expand Up @@ -41,7 +41,7 @@ contract CECDSASHA2Signer is ICertificateSigner, Initializable {
bool public isSecp;
bool public isSha2;

function __CECDSASHA2Signer_init(bool isSecp_, bool isSha2_) external initializer {
function __CECDSA384Signer_init(bool isSecp_, bool isSha2_) external initializer {
isSecp = isSecp_;
isSha2 = isSha2_;
}
Expand Down
6 changes: 3 additions & 3 deletions deploy/helpers/dispatchers/certificate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
CRSAPSSSigner__factory,
CRSADispatcher__factory,
CRSASigner__factory,
CECDSASHA2Signer__factory,
CECDSA384Signer__factory,
CECDSADispatcher__factory,
} from "@ethers-v6";

Expand Down Expand Up @@ -77,11 +77,11 @@ const deployRSAPSSSigner = async (deployer: Deployer, hashfunc: string, exponent
};

const deployECDSASigner = async (deployer: Deployer, curve: string, hashfunc: string, keyLength: string) => {
const signer = await deployer.deploy(CECDSASHA2Signer__factory, {
const signer = await deployer.deploy(CECDSA384Signer__factory, {
name: `CESDCASigner ${curve} ${hashfunc} ${keyLength}`,
});

await signer.__CECDSASHA2Signer_init(curve === "SECP384", hashfunc === "SHA2");
await signer.__CECDSA384Signer_init(curve === "SECP384", hashfunc === "SHA2");

return signer;
};
6 changes: 3 additions & 3 deletions test/certificate/dispatchers/CECDSADispatcher.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ describe("CECDSADispatcher", () => {
let dispatcher: CECDSADispatcher;

before("setup", async () => {
const CECDSASHA2Signer = await ethers.getContractFactory("CECDSASHA2Signer");
const CECDSA384Signer = await ethers.getContractFactory("CECDSA384Signer");
const CECDSADispatcher = await ethers.getContractFactory("CECDSADispatcher", {
libraries: {
PoseidonUnit2L: await (await getPoseidon(2)).getAddress(),
},
});

const signerSha2 = await CECDSASHA2Signer.deploy();
const signerSha2 = await CECDSA384Signer.deploy();
dispatcher = await CECDSADispatcher.deploy();

await signerSha2.__CECDSASHA2Signer_init(true, true);
await signerSha2.__CECDSA384Signer_init(true, true);
await dispatcher.__CECDSADispatcher_init(await signerSha2.getAddress(), 64, "0x0103420004");

await reverter.snapshot();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ import { ethers } from "hardhat";
import { expect } from "chai";
import { Reverter } from "@/test/helpers/";

import { CECDSASHA2Signer } from "@ethers-v6";
import { CECDSA384Signer } from "@ethers-v6";

describe("CECDSASHA2Signer", () => {
describe("CECDSA384Signer", () => {
const reverter = new Reverter();

let signerSha2: CECDSASHA2Signer;
let signerSha2: CECDSA384Signer;

before("setup", async () => {
const CECDSASHA2Signer = await ethers.getContractFactory("CECDSASHA2Signer");
const CECDSA384Signer = await ethers.getContractFactory("CECDSA384Signer");

signerSha2 = await CECDSASHA2Signer.deploy();
signerSha2 = await CECDSA384Signer.deploy();

await signerSha2.__CECDSASHA2Signer_init(true, true);
await signerSha2.__CECDSA384Signer_init(true, true);

await reverter.snapshot();
});
Expand Down

0 comments on commit 7922924

Please sign in to comment.