fix: store merkle proof/root as constant, remove use of RPC in proof gen/verification test

Author: adklempner

package-lock.json

@@ -1,37 +1,24 @@
 import { expect, use } from "chai";
 import chaiAsPromised from "chai-as-promised";
 import sinon from "sinon";
-import { PublicClient } from "viem";
 
 import { RLNBaseContract } from "./rln_base_contract.js";
 
 use(chaiAsPromised);
 
 function createMockRLNBaseContract(
   mockContract: any,
-<<<<<<< HEAD
   mockRpcClient: any
 ): RLNBaseContract {
   const dummy = Object.create(RLNBaseContract.prototype);
   dummy.contract = mockContract;
   dummy.rpcClient = mockRpcClient;
-=======
-  mockPublicClient: PublicClient
-): RLNBaseContract {
-  const dummy = Object.create(RLNBaseContract.prototype);
-  dummy.contract = mockContract;
-  dummy.publicClient = mockPublicClient;
->>>>>>> a88dd8cdbd (feat: migrate rln from ethers to viem)
   return dummy as RLNBaseContract;
 }
 
 describe("RLNBaseContract.getPriceForRateLimit (unit)", function () {
   let mockContract: any;
-<<<<<<< HEAD
   let mockRpcClient: any;
-=======
-  let mockPublicClient: any;
->>>>>>> a88dd8cdbd (feat: migrate rln from ethers to viem)
   let priceCalculatorReadStub: sinon.SinonStub;
   let readContractStub: sinon.SinonStub;
 
@@ -45,11 +32,7 @@ describe("RLNBaseContract.getPriceForRateLimit (unit)", function () {
       }
     };
 
-<<<<<<< HEAD
     mockRpcClient = {
-=======
-    mockPublicClient = {
->>>>>>> a88dd8cdbd (feat: migrate rln from ethers to viem)
       readContract: readContractStub
     };
   });
@@ -66,11 +49,7 @@ describe("RLNBaseContract.getPriceForRateLimit (unit)", function () {
     priceCalculatorReadStub.resolves(priceCalculatorAddress);
     readContractStub.resolves([fakeToken, fakePrice]);
 
-<<<<<<< HEAD
     const rlnBase = createMockRLNBaseContract(mockContract, mockRpcClient);
-=======
-    const rlnBase = createMockRLNBaseContract(mockContract, mockPublicClient);
->>>>>>> a88dd8cdbd (feat: migrate rln from ethers to viem)
     const result = await rlnBase.getPriceForRateLimit(20);
 
     expect(result.token).to.equal(fakeToken);
@@ -92,11 +71,7 @@ describe("RLNBaseContract.getPriceForRateLimit (unit)", function () {
     priceCalculatorReadStub.resolves(priceCalculatorAddress);
     readContractStub.rejects(new Error("fail"));
 
-<<<<<<< HEAD
     const rlnBase = createMockRLNBaseContract(mockContract, mockRpcClient);
-=======
-    const rlnBase = createMockRLNBaseContract(mockContract, mockPublicClient);
->>>>>>> a88dd8cdbd (feat: migrate rln from ethers to viem)
     await expect(rlnBase.getPriceForRateLimit(20)).to.be.rejectedWith("fail");
 
     expect(priceCalculatorReadStub.calledOnce).to.be.true;
@@ -109,11 +84,7 @@ describe("RLNBaseContract.getPriceForRateLimit (unit)", function () {
     priceCalculatorReadStub.resolves(priceCalculatorAddress);
     readContractStub.resolves([null, null]);
 
-<<<<<<< HEAD
     const rlnBase = createMockRLNBaseContract(mockContract, mockRpcClient);
-=======
-    const rlnBase = createMockRLNBaseContract(mockContract, mockPublicClient);
->>>>>>> a88dd8cdbd (feat: migrate rln from ethers to viem)
     const result = await rlnBase.getPriceForRateLimit(20);
 
     expect(result.token).to.be.null;

packages/rln/src/contract/price_calculator.spec.ts

@@ -1,23 +1,14 @@
-<<<<<<< HEAD
 import { Address } from "viem";
 
 import { RpcClient } from "../utils/index.js";
-=======
-import { Address, PublicClient, WalletClient } from "viem";
->>>>>>> a88dd8cdbd (feat: migrate rln from ethers to viem)
 
 export type Member = {
   idCommitment: string;
   index: bigint;
 };
 
 export interface RLNContractOptions {
-<<<<<<< HEAD
   rpcClient: RpcClient;
-=======
-  publicClient: PublicClient;
-  walletClient: WalletClient;
->>>>>>> a88dd8cdbd (feat: migrate rln from ethers to viem)
   address: Address;
   rateLimit?: number;
 }

packages/rln/src/contract/proof.integration.spec.ts

@@ -4,11 +4,7 @@ import { createRLN } from "./create.js";
 import { IdentityCredential } from "./identity.js";
 import { Keystore } from "./keystore/index.js";
 import { RLNInstance } from "./rln.js";
-<<<<<<< HEAD
 import { createViemClientFromWindow } from "./utils/index.js";
-=======
-import { createViemClientsFromWindow } from "./utils/index.js";
->>>>>>> a88dd8cdbd (feat: migrate rln from ethers to viem)
 
 export {
   RLNBaseContract,
@@ -17,11 +13,7 @@ export {
   RLNInstance,
   IdentityCredential,
   RLN_CONTRACT,
-<<<<<<< HEAD
   createViemClientFromWindow
-=======
-  createViemClientsFromWindow as extractMetaMaskSigner
->>>>>>> a88dd8cdbd (feat: migrate rln from ethers to viem)
 };
 
 export {