Updating to remove unneeded getter code

TrueBlocks · Jun 13, 2022 · d92c7ca · d92c7ca
1 parent f2c02bd
commit d92c7ca
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/makefile b/makefile
@@ -1,4 +1,7 @@
 all:
+	forge test --force
+
+test-all:
 	forge test --force -vvvv
 
 deploy:

diff --git a/src/unchained.sol b/src/unchained.sol
@@ -4,6 +4,8 @@ pragma solidity ^0.8.13;
 contract UnchainedIndex_V2 {
     constructor() {
         owner = msg.sender;
+        emit OwnerChanged(address(0), owner);
+
         manifestHashMap[msg.sender][
             "mainnet"
         ] = "QmP4i6ihnVrj8Tx7cTFw4aY6ungpaPYxDJEZ7Vg1RSNSdm"; // empty file
@@ -12,26 +14,19 @@ contract UnchainedIndex_V2 {
             "mainnet",
             manifestHashMap[msg.sender]["mainnet"]
         );
-        emit OwnerChanged(address(0), owner);
     }
 
+    // Note: this is purposefully permissionless. Anyone may publish a hash
+    // and anyone my query that hash by a given publisher. This is by design.
+    // End users themselves must determine who to believe. We suggest it's us,
+    // but who's to say?
     function publishHash(string memory chain, string memory hash) public {
         manifestHashMap[msg.sender][chain] = hash;
         emit HashPublished(msg.sender, chain, hash);
     }
 
-    function readHash(address publisher, string memory chain)
-        public
-        view
-        returns (string memory)
-    {
-        return manifestHashMap[publisher][chain];
-    }
-
-    function getOwner() public view returns (address) {
-        return owner;
-    }
-
+    // If, at a certain point, we decide to disable or redirect donations. Otherwise,
+    // owner no other purpose. "isOwner isAMistake!"
     function changeOwner(address newOwner) public returns (address oldOwner) {
         require(msg.sender == owner, "msg.sender must be owner");
         oldOwner = owner;

diff --git a/test/unchained.sol b/test/unchained.sol
@@ -11,25 +11,29 @@ contract UnchainIndexTest is Test {
         unchained = new UnchainedIndex_V2();
     }
 
-    function testOwner() public {
-        console.log(unchained.getOwner());
+    function testOwner() public view {
+        console.log(unchained.owner());
     }
 
     function testRead() public {
         assertEq(
-            unchained.readHash(unchained.getOwner(), "mainnet"),
+            unchained.manifestHashMap(unchained.owner(), "mainnet"),
             "QmP4i6ihnVrj8Tx7cTFw4aY6ungpaPYxDJEZ7Vg1RSNSdm"
         );
         unchained.publishHash("sepolia", "12");
-        assertEq(unchained.readHash(unchained.getOwner(), "sepolia"), "12");
+        assertEq(unchained.manifestHashMap(unchained.owner(), "sepolia"), "12");
         assertEq(
-            unchained.readHash(unchained.getOwner(), "mainnet"),
+            unchained.manifestHashMap(unchained.owner(), "mainnet"),
             "QmP4i6ihnVrj8Tx7cTFw4aY6ungpaPYxDJEZ7Vg1RSNSdm"
         );
     }
 
     function testWrite() public {
         unchained.publishHash("sepolia", "12");
-        assertEq(unchained.readHash(unchained.getOwner(), "sepolia"), "12");
+        assertEq(unchained.manifestHashMap(unchained.owner(), "sepolia"), "12");
+        assertEq(
+            unchained.manifestHashMap(unchained.owner(), "mainnet"),
+            "QmP4i6ihnVrj8Tx7cTFw4aY6ungpaPYxDJEZ7Vg1RSNSdm"
+        );
     }
 }