add noDuplicateTxIn tests and rewrite allTransactionsValid considerin…

…g coinbase tx
fluency03 · Apr 27, 2018 · 658718f · 658718f
1 parent 1014558
commit 658718f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/src/main/scala/com/fluency03/blockchain/core/Block.scala b/src/main/scala/com/fluency03/blockchain/core/Block.scala
@@ -2,7 +2,7 @@ package com.fluency03.blockchain
 package core
 
 import com.fluency03.blockchain.core.BlockHeader.hashOfHeaderFields
-import com.fluency03.blockchain.core.Transaction.createCoinbaseTx
+import com.fluency03.blockchain.core.Transaction.{createCoinbaseTx, validateCoinbaseTx, noDuplicateTxInOf}
 import org.json4s.native.JsonMethods.{compact, render}
 import org.json4s.{Extraction, JValue}
 
@@ -39,7 +39,12 @@ case class Block(header: BlockHeader, transactions: Seq[Transaction], hash: Stri
 
   def hasValidHeaderHash: Boolean = hash == header.hash
 
-  def allTransactionsValid(uTxOs: mutable.Map[Outpoint, TxOut]): Boolean = transactions.forall(tx => tx.isValid(uTxOs))
+  def allTransactionsValid(uTxOs: mutable.Map[Outpoint, TxOut]): Boolean = transactions match {
+    case Nil => false
+    case init :+ last => validateCoinbaseTx(last, index) && init.forall(tx => tx.isValid(uTxOs))
+  }
+
+  def noDuplicateTxIn(): Boolean = noDuplicateTxInOf(transactions)
 
   def toJson: JValue = Extraction.decompose(this)
 

diff --git a/src/main/scala/com/fluency03/blockchain/core/Transaction.scala b/src/main/scala/com/fluency03/blockchain/core/Transaction.scala
@@ -142,7 +142,7 @@ object Transaction {
       .map(txIn => Outpoint(txIn.previousOut.id, txIn.previousOut.index) -> TxOut("", 0))
       .toMap
 
-  def noDuplicateTxIn(transactions: Seq[Transaction]): Boolean = {
+  def noDuplicateTxInOf(transactions: Seq[Transaction]): Boolean = {
     val allRefs = transactions.map(_.txIns.map(_.previousOut)).foldLeft(Seq.empty[Outpoint])(_ ++ _)
     allRefs.distinct.length == allRefs.length
   }

diff --git a/src/test/scala/com/fluency03/blockchain/core/BlockTest.scala b/src/test/scala/com/fluency03/blockchain/core/BlockTest.scala
@@ -31,6 +31,7 @@ class BlockTest extends FlatSpec with Matchers {
     genesis.nonce shouldEqual expectedHeader.nonce
     genesis.hash shouldEqual expectedHeader.hash
     genesis.hasValidHash shouldEqual true
+    genesis.noDuplicateTxIn shouldEqual true
     genesis.toJson shouldEqual expectedBlockJson
     parse(genesis.toString) shouldEqual expectedBlockJson
 
@@ -69,6 +70,7 @@ class BlockTest extends FlatSpec with Matchers {
     genesisNextTrial.hash shouldEqual newExpectedHeader.hash
     genesisNextTrial.hasValidMerkleHash shouldEqual true
     genesisNextTrial.hasValidHash shouldEqual false
+    genesisNextTrial.noDuplicateTxIn shouldEqual true
     val headerJson = expectedHeader.toJson.transformField {
       case ("nonce", JInt(x)) => ("nonce", JInt(x+1))
     }
@@ -96,6 +98,7 @@ class BlockTest extends FlatSpec with Matchers {
     newBlock.hash shouldEqual newHash
     newBlock.hasValidMerkleHash shouldEqual true
     newBlock.hasValidHash shouldEqual false
+    newBlock.noDuplicateTxIn shouldEqual true
     val headerJson = expectedHeader.toJson.transformField {
       case ("merkleHash", JString(_)) => ("merkleHash", newMerkleHash)
     }

diff --git a/src/test/scala/com/fluency03/blockchain/core/TransactionTest.scala b/src/test/scala/com/fluency03/blockchain/core/TransactionTest.scala
@@ -208,35 +208,35 @@ class TransactionTest extends FlatSpec with Matchers {
   }
 
   "noDuplicateTxIn" should "detect whether Seq of Transactions contians duplicate TxIns." in {
-    noDuplicateTxIn(Seq.empty[Transaction]) shouldEqual true
+    noDuplicateTxInOf(Seq.empty[Transaction]) shouldEqual true
     val tx1: Transaction = Transaction(
       Seq(TxIn(Outpoint("a", 0), ""),
         TxIn(Outpoint("b", 1), "")),
       Seq(TxOut("o", 40)),
       genesisTimestamp
     )
-    noDuplicateTxIn(Seq(tx1)) shouldEqual true
+    noDuplicateTxInOf(Seq(tx1)) shouldEqual true
     val tx2: Transaction = Transaction(
       Seq(TxIn(Outpoint("c", 0), ""),
         TxIn(Outpoint("d", 1), "")),
       Seq(TxOut("o", 40)),
       genesisTimestamp
     )
-    noDuplicateTxIn(Seq(tx1, tx2)) shouldEqual true
+    noDuplicateTxInOf(Seq(tx1, tx2)) shouldEqual true
     val tx3: Transaction = Transaction(
       Seq(TxIn(Outpoint("e", 0), ""),
         TxIn(Outpoint("a", 1), "")),
       Seq(TxOut("o", 40)),
       genesisTimestamp
     )
-    noDuplicateTxIn(Seq(tx1, tx2, tx3)) shouldEqual true
+    noDuplicateTxInOf(Seq(tx1, tx2, tx3)) shouldEqual true
     val tx4: Transaction = Transaction(
       Seq(TxIn(Outpoint("a", 0), ""),
         TxIn(Outpoint("f", 1), "")),
       Seq(TxOut("o", 40)),
       genesisTimestamp
     )
-    noDuplicateTxIn(Seq(tx1, tx2, tx3, tx4)) shouldEqual false
+    noDuplicateTxInOf(Seq(tx1, tx2, tx3, tx4)) shouldEqual false
   }