From 3ac4be7bbd11a0ecaf9880ed3c2be6e8c1249949 Mon Sep 17 00:00:00 2001
From: Ricardo Guilherme Schmidt <3esmit@gmail.com>
Date: Thu, 26 Apr 2018 01:48:14 -0300
Subject: [PATCH] encapstulate message hashing as views

---
 contracts/communication/MessageTribute.sol | 47 +++++++++++++++++++---
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/contracts/communication/MessageTribute.sol b/contracts/communication/MessageTribute.sol
index a44be47..e1a8692 100644
--- a/contracts/communication/MessageTribute.sol
+++ b/contracts/communication/MessageTribute.sol
@@ -69,9 +69,7 @@ contract MessageTribute is MessageSigned {
         require(_timeLimit <= block.timestamp);
         address grantor = recoverAddress(
             getSignHash(
-                keccak256(
-                    address(this),
-                    bytes4(keccak256("grantAudience(bytes32,bool,bool,bytes32)")),
+                getGrantAudienceHash(
                     keccak256(_requesterSignature),
                     _approve,
                     _waive,
@@ -86,9 +84,7 @@ contract MessageTribute is MessageSigned {
         granted[hashedSecret] = true;
         address requester = recoverAddress(
             getSignHash(
-                keccak256(
-                    address(this),
-                    bytes4(keccak256("requestAudience(address,bytes32,uint256)")),
+                getRequestAudienceHash(
                     grantor,
                     hashedSecret,
                     _timeLimit
@@ -96,6 +92,7 @@ contract MessageTribute is MessageSigned {
             ),
             _requesterSignature
         );
+        
         require(lastAudienceDeniedTimestamp[grantor][requester] + 3 days <= now);
         if(!_approve)
             lastAudienceDeniedTimestamp[grantor][requester] = block.timestamp;
@@ -111,6 +108,44 @@ contract MessageTribute is MessageSigned {
         emit AudienceGranted(grantor, requester, _approve);
     }
 
+    function getGrantAudienceHash(
+        bytes32 _requesterSignatureHash,
+        bool _approve,
+        bool _waive,
+        bytes32 _secret
+    ) 
+        public
+        view
+        returns(bytes32)
+    {
+        return keccak256(
+            address(this),
+            bytes4(keccak256("grantAudience(bytes32,bool,bool,bytes32)")),
+            _requesterSignatureHash,
+            _approve,
+            _waive,
+            _secret
+        );
+    }
+
+    function getRequestAudienceHash(
+        address grantor,
+        bytes32 hashedSecret,
+        uint _timeLimit
+    )
+        public
+        view
+        returns(bytes32)
+    {
+        return keccak256(
+            address(this),
+            bytes4(keccak256("requestAudience(address,bytes32,uint256)")),
+            grantor,
+            hashedSecret,
+            _timeLimit
+        );
+    }
+
     /**
      * @notice Determine if msg.sender ha enough funds to chat with `_to`
      * @param _to Account `msg.sender` wishes to talk to