Refactor contract

Author: spacesailor24

accs-contract-call/contracts/src/AccessControl.sol

@@ -4,12 +4,12 @@ pragma solidity ^0.8.13;
 contract AccessControl {
     mapping(address => bool) public revokedAccess;
 
-    function grantAccess(address user) public {
-        revokedAccess[user] = false;
+    function grantAccess() public {
+        revokedAccess[msg.sender] = false;
     }
 
-    function revokeAccess(address user) public {
-        revokedAccess[user] = true;
+    function revokeAccess() public {
+        revokedAccess[msg.sender] = true;
     }
 
     function hasRevokedAccess(address user) public view returns (bool) {

accs-contract-call/contracts/test/AccessControl.t.sol

@@ -10,25 +10,33 @@ contract AccessControlTest is Test {
     function setUp() public {
         accessControl = new AccessControl();
     }
+    
+    function testGrantedByDefault() public {
+        address user = address(this);
+        assertFalse(accessControl.hasRevokedAccess(user));
+    }
 
     function testGrantAccess() public {
-        address user = address(0xBEEF);
-        accessControl.grantAccess(user);
+        address user = address(this);
+        accessControl.grantAccess();
         assertFalse(accessControl.hasRevokedAccess(user));
     }
 
     function testRevokeAccess() public {
-        address user = address(0xCAFE);
-        accessControl.revokeAccess(user);
+        address user = address(this);
+        accessControl.revokeAccess();
         assertTrue(accessControl.hasRevokedAccess(user));
     }
 
     function testHasRevokedAccess() public {
-        address user1 = address(0xDEAD);
+        address user1 = address(this);
         address user2 = address(0xFEED);
 
-        accessControl.revokeAccess(user1);
-        accessControl.grantAccess(user2);
+        vm.prank(user1);
+        accessControl.revokeAccess();
+
+        vm.prank(user2);
+        accessControl.grantAccess();
 
         assertTrue(accessControl.hasRevokedAccess(user1));
         assertFalse(accessControl.hasRevokedAccess(user2));

accs-contract-call/nodejs/.env.example

@@ -1,3 +1,3 @@
 ETHEREUM_PRIVATE_KEY=
-DEPLOYED_ACCESS_CONTROL_CONTRACT_ADDRESS=0xf960775B87fF2f53Eb962A8845F647615047389E
+DEPLOYED_ACCESS_CONTROL_CONTRACT_ADDRESS=0x4fc0c02ebbAbb81C04dB0C462C8c25cb37970eB1
 LIT_CAPACITY_CREDIT_TOKEN_ID=

accs-contract-call/nodejs/README.md

@@ -11,6 +11,6 @@ This code example demonstrates how access can be revoked to decrypt data using `
      - Create the Lit Capacity Delegation Auth Sig
      - Create the Lit Auth Sig to generate the Session Signatures
    - `DEPLOYED_ACCESS_CONTROL_CONTRACT_ADDRESS` - The address of the deployed Access Control Contract
-     - [The contract](../contracts/src/AccessControl.sol) has been deployed on the Lit Chronicle Yellowstone blockchain at: `0xf960775B87fF2f53Eb962A8845F647615047389E` for testing purposes
+     - [The contract](../contracts/src/AccessControl.sol) has been deployed on the Lit Chronicle Yellowstone blockchain at: `0x4fc0c02ebbAbb81C04dB0C462C8c25cb37970eB1` for testing purposes
    - `LIT_CAPACITY_CREDIT_TOKEN_ID` - The ID of the Lit Capacity Credit Token to avoid minting a new one when the example is ran
 3. Run the included tests using `yarn test`

accs-contract-call/nodejs/src/AccessControl.json

@@ -23,14 +23,14 @@ describe("Testing specific functionality", () => {
     DEPLOYED_ACCESS_CONTROL_CONTRACT_ADDRESS,
     [
       {
-        inputs: [{ internalType: "address", name: "user", type: "address" }],
+        inputs: [],
         name: "grantAccess",
         outputs: [],
         stateMutability: "nonpayable",
         type: "function",
       },
       {
-        inputs: [{ internalType: "address", name: "user", type: "address" }],
+        inputs: [],
         name: "revokeAccess",
         outputs: [],
         stateMutability: "nonpayable",
@@ -41,15 +41,15 @@ describe("Testing specific functionality", () => {
   );
 
   it("should decrypt the secret string because access has been granted", async () => {
-    const tx = await accessControlContract.grantAccess(ethersWallet.address);
+    const tx = await accessControlContract.grantAccess();
     await tx.wait();
 
     const decryptedString = await runExample(SECRET_STRING);
     expect(decryptedString).to.equal(SECRET_STRING);
   }).timeout(120_000);
 
   it("shouldn't decrypt the secret string because access has been revoked", async () => {
-    const tx = await accessControlContract.revokeAccess(ethersWallet.address);
+    const tx = await accessControlContract.revokeAccess();
     await tx.wait();
 
     let response;