Simplify get squeak with cleared decryption key (#366)

* Simplify get squeak method of squeak store working

* Shorten sleep time for mining blocks

itests/run_itest.sh

@@ -7,7 +7,7 @@ function mine_blocks {
     while true; do
 	printf "Mining 1 block to address: $MINING_ADDRESS ..."
 	docker-compose run btcctl generate 1
-	sleep 10
+	sleep 1
     done
 }
 
@@ -26,7 +26,7 @@ do
     echo "new_address_output:"
     echo $new_address_output
     client_address=$(echo $new_address_output | jq .address -r)
-    sleep 10
+    sleep 1
 done
 
 MINING_ADDRESS=$client_address docker-compose up -d btcd

itests/tests/test_squeak_node.py

@@ -40,7 +40,7 @@ def test_post_squeak(
     )
 
     # Wait a few seconds for the squeak to be verified on the server.
-    time.sleep(5)
+    time.sleep(1)
 
     # Get the same squeak from the server
     get_response = server_stub.GetSqueak(
@@ -652,7 +652,7 @@ def test_list_channels(server_stub, admin_stub, lightning_client, saved_squeak_h
 def test_send_coins(server_stub, admin_stub, lightning_client):
     new_address_response = admin_stub.LndNewAddress(ln.NewAddressRequest())
     send_coins_response = lightning_client.send_coins(new_address_response.address, 55555555)
-    time.sleep(40)
+    time.sleep(10)
     get_transactions_response = admin_stub.LndGetTransactions(ln.GetTransactionsRequest())
 
     assert any([

squeaknode/node/peer_task.py

@@ -223,8 +223,7 @@ class PeerSyncTask:
         self.get_offer(squeak_hash)
 
     def _get_local_squeak(self, squeak_hash):
-        squeak_entry = self.squeak_store.get_squeak(squeak_hash)
-        return squeak_entry.squeak
+        return self.squeak_store.get_squeak(squeak_hash)
 
     def _upload_squeak(self, squeak_hash):
         logger.info("Uploading squeak: {}".format(squeak_hash.hex()))

squeaknode/node/squeak_node.py

@@ -99,18 +99,17 @@ class SqueakNode:
         return self.squeak_store.save_squeak(squeak, verify=True, skip_whitelist_check=True)
 
     def get_public_squeak(self, squeak_hash):
-        return self.squeak_store.get_public_squeak(squeak_hash)
+        return self.squeak_store.get_squeak(squeak_hash, clear_decryption_key=True)
 
-    def get_squeak_entry(self, squeak_hash):
-        return self.squeak_store.get_squeak(squeak_hash)
+    # def get_squeak_entry(self, squeak_hash):
+    #     return self.squeak_store.get_squeak(squeak_hash)
 
     def lookup_squeaks(self, addresses, min_block, max_block):
         return self.squeak_store.lookup_squeaks(addresses, min_block, max_block)
 
     def get_buy_offer(self, squeak_hash, challenge):
         # Get the squeak from the database
-        squeak_entry = self.squeak_store.get_squeak(squeak_hash)
-        squeak = squeak_entry.squeak
+        squeak = self.squeak_store.get_squeak(squeak_hash)
         # Get the decryption key from the squeak
         decryption_key = squeak.GetDecryptionKey()
         # Solve the proof

squeaknode/node/squeak_store.py

@@ -29,16 +29,13 @@ class SqueakStore:
             self.squeak_block_verifier.add_squeak_to_queue(inserted_squeak_hash)
         return inserted_squeak_hash
 
-    def get_squeak(self, squeak_hash):
-        return self.postgres_db.get_squeak_entry(squeak_hash)
-
-    def get_public_squeak(self, squeak_hash):
+    def get_squeak(self, squeak_hash, clear_decryption_key=False):
         squeak_entry = self.postgres_db.get_squeak_entry(squeak_hash)
         if squeak_entry is None:
             return None
         squeak = squeak_entry.squeak
-        # Remove the decryption key before returning.
-        squeak.ClearDecryptionKey()
+        if clear_decryption_key:
+            squeak.ClearDecryptionKey()
         return squeak
 
     def get_squeak_entry_with_profile(self, squeak_hash):