Block punishment improvement

Signed-off-by: domhauton <domhauton@gmail.com>

build.gradle

@@ -35,7 +35,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "nebula.deb"
 apply plugin: 'nebula.rpm'
 
-project.version = '1.0.0-alpha.5'
+project.version = '1.0.0-alpha.6'
 project.group = 'com.domhauton.membrane'
 
 jar {

src/main/java/com/domhauton/membrane/distributed/ContractManagerImpl.java

@@ -357,7 +357,7 @@ public Set<EvidenceRequest> processPeerContractUpdate(String peerId, DateTime da
         Set<String> expectedBlocks = blockIds.stream()
             .filter(myBlockIds::contains)
             .collect(Collectors.toSet());
-        Set<String> blocksToSkip = appraisalLedger.getReportsRecieved(peerId, dateTime, myBlockIds.size());
+        Set<String> blocksToSkip = appraisalLedger.getReportsReceived(peerId, dateTime, myBlockIds.size());
         Set<EvidenceRequest> activeBlockRequests = getActiveBlockEvidenceRequests(dateTime, expectedBlocks, blocksToSkip);
 
         // Aggregate all generated evidence requests.
@@ -548,7 +548,7 @@ EvidenceResponse processEvidenceRequest(String peer, EvidenceRequest evidenceReq
   public void run() {
     executorService.scheduleAtFixedRate(this::sendUpdateToAllContractedPeers,
         TIME_BEFORE_FIRST_BROADCAST_MINS,
-        DateTimeConstants.MINUTES_PER_HOUR,
+        DateTimeConstants.MINUTES_PER_HOUR / 4,
         TimeUnit.MINUTES);
 
     executorService.scheduleAtFixedRate(this::distributeShards,

src/main/java/com/domhauton/membrane/distributed/appraisal/AppraisalLedger.java

@@ -81,7 +81,7 @@ public void registerLostBlock(String peerId, DateTime lostDateTime, int expected
     getPeerAppraisal(peerId).addLostBlock(lostDateTime, expectedBlocks);
   }
 
-  public Set<String> getReportsRecieved(String peerId, DateTime dateTime, long expectedBlocks) {
+  public Set<String> getReportsReceived(String peerId, DateTime dateTime, long expectedBlocks) {
     return getPeerAppraisal(peerId).getReportsReceived(dateTime, expectedBlocks);
   }
 

src/main/java/com/domhauton/membrane/distributed/appraisal/PeerAppraisal.java

@@ -6,6 +6,7 @@
 import org.apache.logging.log4j.Logger;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeConstants;
+import org.joda.time.Hours;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -215,7 +216,9 @@ synchronized void addLostBlock(DateTime dateTimeLost, int totalExpectedBlocks) {
    * @return Chance [0.0,1.0]
    */
   double getBlockLosingRate() {
-    double chanceOfLosingBlocks = totalLifetimeBlocks <= 0 ? 0.0d : (double) lostBlocks / (double) totalLifetimeBlocks;
+    double punishmentMultiplier = Math.min(DateTimeConstants.HOURS_PER_WEEK * 2, Math.abs(Hours.hoursBetween(firstInteractionTime, DateTime.now()).getHours()));
+    punishmentMultiplier = Math.max(1.0, punishmentMultiplier);
+    double chanceOfLosingBlocks = totalLifetimeBlocks <= 0 ? 0.0d : ((double) lostBlocks * punishmentMultiplier) / (double) totalLifetimeBlocks;
     // Clamp between 0.0d and 1.0d
     return Math.min(chanceOfLosingBlocks, 1.0d);
   }

src/test/java/com/domhauton/membrane/distributed/ContractManagerImplTest.java

@@ -538,7 +538,7 @@ void blockSaltedHashTest() throws Exception {
     // Receive response
     contractManagerImpl2.processEvidenceResponses(PEER_1, baseDateTime, evidenceResponses);
 
-    Assertions.assertEquals(Collections.singleton(blockId), appraisalLedgerInner2.getReportsRecieved(PEER_1, baseDateTime, 1));
+    Assertions.assertEquals(Collections.singleton(blockId), appraisalLedgerInner2.getReportsReceived(PEER_1, baseDateTime, 1));
   }
 
   private void setupConnection() {