Merge branch 'master' into node

hyperledger-labs · Oct 27, 2017 · 90623f2 · 90623f2
2 parents 54c3204 + 70cea63
commit 90623f2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/examples/src/main/scala/examples/hybrid/HLocalInterface.scala b/examples/src/main/scala/examples/hybrid/HLocalInterface.scala
@@ -7,7 +7,6 @@ import examples.hybrid.mining.HybridMiningSettings
 import examples.hybrid.mining.PosForger.{StartForging, StopForging}
 import examples.hybrid.mining.PowMiner.{MineBlock, StartMining, StopMining}
 import scorex.core.{LocalInterface, ModifierId, VersionTag}
-import scorex.core.settings.MinerSettings
 import scorex.core.transaction.box.proposition.PublicKey25519Proposition
 
 class HLocalInterface(override val viewHolderRef: ActorRef,

diff --git a/src/main/scala/scorex/core/network/NodeViewSynchronizer.scala b/src/main/scala/scorex/core/network/NodeViewSynchronizer.scala
@@ -78,13 +78,17 @@ class NodeViewSynchronizer[P <: Proposition, TX <: Transaction[P], SI <: SyncInf
   }
 
   private def viewHolderEvents: Receive = {
+    case SuccessfulTransaction(tx) => broadcastModifierInv(tx)
     case FailedTransaction(tx, throwable) =>
     //todo: ban source peer?
+
+    case SyntacticallySuccessfulModifier(mod) =>
     case SyntacticallyFailedModification(mod, throwable) =>
     //todo: ban source peer?
 
-    case SuccessfulTransaction(tx) => broadcastModifierInv(tx)
-    case SyntacticallySuccessfulModifier(mod) => broadcastModifierInv(mod)
+    case SemanticallySuccessfulModifier(mod) => broadcastModifierInv(mod)
+    case SemanticallyFailedModification(mod, throwable) =>
+    //todo: ban source peer?
   }
 
   private def getLocalSyncInfo: Receive = {