fix: conflicts

sismo-core · Jul 13, 2023 · 86bea2b · 86bea2b
1 parent 48def8f
commit 86bea2b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/misc/CheatSheet.sol b/src/misc/CheatSheet.sol
@@ -6,13 +6,13 @@ import "forge-std/console.sol";
 
 contract CheatSheet is SismoConnect {
  // reference your appId
- bytes16 public constant APP_ID = 0x32403ced4b65f2079eda77c84e7d2be6;
+ bytes16 private _appId = 0x32403ced4b65f2079eda77c84e7d2be6;
  // allow impersonation
- bool public constant IS_IMPERSONATION_MODE = true;
+ bool private _isImpersonationMode = true;
 
  constructor()
  // use buildConfig helper to easily build a Sismo Connect config in Solidity
- SismoConnect(buildConfig({appId: APP_ID, isImpersonationMode: IS_IMPERSONATION_MODE}))
+ SismoConnect(buildConfig({appId: _appId, isImpersonationMode: _isImpersonationMode}))
  {}
 
  function verifySismoConnectResponse(bytes memory response) public {

diff --git a/test/e2e/SismoConnectE2E.t.sol b/test/e2e/SismoConnectE2E.t.sol
@@ -302,9 +302,7 @@ contract SismoConnectE2E is HydraS3BaseTest {
 
  UpgradeableExample upgradeable = UpgradeableExample(address(proxy));
 
- (, bytes memory responseEncoded) = hydraS3Proofs.getResponseWithOneClaimAndSignature(
- commitmentMapperRegistry
- );
+ (, bytes memory responseEncoded) = hydraS3Proofs.getResponseWithOneClaimAndSignature();
 
  upgradeable.exposed_verify({responseBytes: responseEncoded, signature: signatureRequest});