From e27ff67f6ea11fca0f75d6207ebf7d6186b39e36 Mon Sep 17 00:00:00 2001
From: rymnc <43716372+rymnc@users.noreply.github.com>
Date: Wed, 29 May 2024 17:07:35 +0530
Subject: [PATCH] fix: cleanup

---
 .gas-snapshot        | 27 ++++++++++++++-------------
 package.json         | 10 +++++++++-
 script/Deploy.s.sol  |  4 ++--
 test/WakuRlnV2.t.sol |  9 ++++++---
 4 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/.gas-snapshot b/.gas-snapshot
index caeee1e..c39b737 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -1,13 +1,14 @@
-WakuRlnV2Test:test__IdCommitmentToMetadata__DoesntExist() (gas: 16711)
-WakuRlnV2Test:test__InvalidPaginationQuery__EndIndexGTIdCommitmentIndex() (gas: 18248)
-WakuRlnV2Test:test__InvalidPaginationQuery__StartIndexGTEndIndex() (gas: 16071)
-WakuRlnV2Test:test__InvalidRegistration__DuplicateIdCommitment() (gas: 99800)
-WakuRlnV2Test:test__InvalidRegistration__FullTree() (gas: 14319)
-WakuRlnV2Test:test__InvalidRegistration__InvalidIdCommitment__LargerThanField() (gas: 15200)
-WakuRlnV2Test:test__InvalidRegistration__InvalidIdCommitment__Zero() (gas: 14012)
-WakuRlnV2Test:test__InvalidRegistration__InvalidUserMessageLimit__LargerThanMax() (gas: 17603)
-WakuRlnV2Test:test__InvalidRegistration__InvalidUserMessageLimit__Zero() (gas: 14114)
-WakuRlnV2Test:test__ValidPaginationQuery(uint32) (runs: 1000, μ: 442426, ~: 159837)
-WakuRlnV2Test:test__ValidPaginationQuery__OneElement() (gas: 120040)
-WakuRlnV2Test:test__ValidRegistration(uint256,uint32) (runs: 1000, μ: 124614, ~: 124614)
-WakuRlnV2Test:test__ValidRegistration__kats() (gas: 96881)
\ No newline at end of file
+WakuRlnV2Test:test__IdCommitmentToMetadata__DoesntExist() (gas: 16723)
+WakuRlnV2Test:test__InvalidPaginationQuery__EndIndexGTIdCommitmentIndex() (gas: 18260)
+WakuRlnV2Test:test__InvalidPaginationQuery__StartIndexGTEndIndex() (gas: 16083)
+WakuRlnV2Test:test__InvalidRegistration__DuplicateIdCommitment() (gas: 99824)
+WakuRlnV2Test:test__InvalidRegistration__FullTree() (gas: 14343)
+WakuRlnV2Test:test__InvalidRegistration__InvalidIdCommitment__LargerThanField() (gas: 15258)
+WakuRlnV2Test:test__InvalidRegistration__InvalidIdCommitment__Zero() (gas: 14046)
+WakuRlnV2Test:test__InvalidRegistration__InvalidUserMessageLimit__LargerThanMax() (gas: 17639)
+WakuRlnV2Test:test__InvalidRegistration__InvalidUserMessageLimit__Zero() (gas: 14126)
+WakuRlnV2Test:test__Upgrade() (gas: 3668443)
+WakuRlnV2Test:test__ValidPaginationQuery(uint32) (runs: 1000, μ: 446587, ~: 159861)
+WakuRlnV2Test:test__ValidPaginationQuery__OneElement() (gas: 120064)
+WakuRlnV2Test:test__ValidRegistration(uint256,uint32) (runs: 1000, μ: 124674, ~: 124674)
+WakuRlnV2Test:test__ValidRegistration__kats() (gas: 96917)
\ No newline at end of file
diff --git a/package.json b/package.json
index 5aea029..ad8c470 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,15 @@
     "@zk-kit/imt.sol": "https://gitpkg.now.sh/privacy-scaling-explorations/zk-kit/packages/imt.sol?0699fd1e5ad3683ae0090e0626f75d7834145500",
     "poseidon-solidity": "^0.0.5"
   },
-  "keywords": ["blockchain", "ethereum", "forge", "foundry", "smart-contracts", "solidity", "template"],
+  "keywords": [
+    "blockchain",
+    "ethereum",
+    "forge",
+    "foundry",
+    "smart-contracts",
+    "solidity",
+    "template"
+  ],
   "private": true,
   "scripts": {
     "clean": "rm -rf cache out",
diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol
index 2168092..e54315b 100644
--- a/script/Deploy.s.sol
+++ b/script/Deploy.s.sol
@@ -18,9 +18,9 @@ contract Deploy is BaseScript {
         w = WakuRlnV2(proxy);
     }
 
-    function upgrade(address proxy, address newImpl, uint32 maxMessageLimit) public {
+    function upgrade(address proxy, address newImpl) public {
         vm.startBroadcast(msg.sender);
-        bytes memory data = abi.encodeCall(WakuRlnV2.initialize, (msg.sender, maxMessageLimit));
+        bytes memory data;
         UUPSUpgradeable(proxy).upgradeToAndCall(newImpl, data);
         vm.stopBroadcast();
     }
diff --git a/test/WakuRlnV2.t.sol b/test/WakuRlnV2.t.sol
index e75c68f..f699bbd 100644
--- a/test/WakuRlnV2.t.sol
+++ b/test/WakuRlnV2.t.sol
@@ -195,8 +195,11 @@ contract WakuRlnV2Test is Test {
     function test__Upgrade() external {
         address newImplementation = address(new WakuRlnV2());
         Deploy deployment = new Deploy();
-        console.log("OWNER: %s", w.owner());
-        deployment.upgrade(address(w), newImplementation, 30);
-        assertEq(w.MAX_MESSAGE_LIMIT(), 30);
+        deployment.upgrade(address(w), newImplementation);
+        // ensure that the implementation is set correctly
+        address fetchedImpl = address(
+            uint160(uint256(vm.load(address(w), 0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc)))
+        );
+        assertEq(fetchedImpl, newImplementation);
     }
 }