rename Wallet to SingleWallet

fluency03 · May 3, 2018 · 9b71195 · 9b71195
1 parent a5cb94a
commit 9b71195
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 20 deletions.
diff --git a/src/main/scala/com/fluency03/blockchain/api/actors/BlockchainActor.scala b/src/main/scala/com/fluency03/blockchain/api/actors/BlockchainActor.scala
@@ -83,11 +83,9 @@ class BlockchainActor extends ActorSupport {
 
   private def onGetBlockFromChain(hash: String): Unit = sender() ! getBlockFromChain(hash)
 
-  private def onGetTxOfBlock(id: String, hash: String): Unit = sender() ! {
-    getBlockFromChain(hash) match {
-      case Some(block) => block.transactions.find(_.id == id)
-      case None => None
-    }
+  private def onGetTxOfBlock(id: String, hash: String): Unit = getBlockFromChain(hash) match {
+    case Some(block) => sender() ! block.transactions.find(_.id == id)
+    case None => sender() ! None
   }
 
   private def onAddBlock(block: Block): Unit = blockchainOpt match {

diff --git a/src/main/scala/com/fluency03/blockchain/api/actors/BlocksActor.scala b/src/main/scala/com/fluency03/blockchain/api/actors/BlocksActor.scala
@@ -63,11 +63,10 @@ class BlocksActor extends ActorSupport {
 
   private[this] def onGetBlock(hash: String): Unit = sender() ! blocksPool.get(hash)
 
-  private[this] def onDeleteBlock(hash: String): Unit = {
+  private[this] def onDeleteBlock(hash: String): Unit =
     if (blocksPool.contains(hash)) {
       blocksPool -= hash
       sender() ! SuccessMsg(s"Block $hash deleted.")
     } else sender() ! FailureMsg(s"Block $hash does not exist.")
-  }
 
 }
diff --git a/src/main/scala/com/fluency03/blockchain/api/actors/PeerActor.scala b/src/main/scala/com/fluency03/blockchain/api/actors/PeerActor.scala
@@ -5,7 +5,7 @@ import java.security.KeyPair
 
 import akka.actor.Props
 import com.fluency03.blockchain.api.actors.PeerActor._
-import com.fluency03.blockchain.core.{Peer, Wallet}
+import com.fluency03.blockchain.core.{Peer, SingleWallet}
 
 import scala.collection.mutable
 
@@ -24,7 +24,7 @@ class PeerActor extends ActorSupport {
   override def postStop(): Unit = log.info("{} stopped!", this.getClass.getSimpleName)
 
   // TODO (Chang): need persistence
-  val wallets = mutable.Map.empty[String, Wallet]
+  val wallets = mutable.Map.empty[String, SingleWallet]
   val others = mutable.Map.empty[String, Peer]
 
   /**
@@ -41,7 +41,7 @@ class PeerActor extends ActorSupport {
   }
 
   private def addWallet(): String = {
-    val newWallet = Wallet()
+    val newWallet = SingleWallet()
     wallets += (newWallet.address -> newWallet)
     newWallet.address
   }

diff --git a/src/main/scala/com/fluency03/blockchain/api/actors/TransactionsActor.scala b/src/main/scala/com/fluency03/blockchain/api/actors/TransactionsActor.scala
@@ -52,13 +52,12 @@ class TransactionsActor extends ActorSupport {
     k => ids.contains(k)
   ).values.toSeq
 
-  private def onCreateTransaction(tx: Transaction): Unit = {
+  private def onCreateTransaction(tx: Transaction): Unit =
     if (transPool.contains(tx.id)) sender() ! FailureMsg(s"Transaction ${tx.id} already exists.")
     else {
       transPool += (tx.id -> tx)
       sender() ! SuccessMsg(s"Transaction ${tx.id} created.")
     }
-  }
 
   private def onGetTransaction(id: String): Unit = sender() ! transPool.get(id)
 

diff --git a/...om/fluency03/blockchain/core/Wallet.scala → ...ency03/blockchain/core/SingleWallet.scala b/...om/fluency03/blockchain/core/Wallet.scala → ...ency03/blockchain/core/SingleWallet.scala
@@ -3,12 +3,12 @@ package core
 
 import java.security.KeyPair
 
-import com.fluency03.blockchain.core.Wallet.balanceOfWallet
+import com.fluency03.blockchain.core.SingleWallet.balanceOfWallet
 import com.fluency03.blockchain.core.Transaction.signTxIn
 
 import scala.collection.mutable
 
-case class Wallet() {
+case class SingleWallet() {
 
   private[this] val keyPair: KeyPair = Crypto.generateKeyPair()
 
@@ -21,9 +21,9 @@ case class Wallet() {
 
 }
 
-object Wallet {
+object SingleWallet {
 
-  def balanceOfWallet(wallet: Wallet, uTxOs: mutable.Map[Outpoint, TxOut]): Long =
+  def balanceOfWallet(wallet: SingleWallet, uTxOs: mutable.Map[Outpoint, TxOut]): Long =
     balanceOfAddress(wallet.address, uTxOs)
 
   def balanceOfAddress(address: String, uTxOs: mutable.Map[Outpoint, TxOut]): Long =

diff --git a/...luency03/blockchain/core/WalletTest.scala → ...03/blockchain/core/SingleWalletTest.scala b/...luency03/blockchain/core/WalletTest.scala → ...03/blockchain/core/SingleWalletTest.scala
@@ -1,16 +1,16 @@
 package com.fluency03.blockchain
 package core
 
-import com.fluency03.blockchain.core.Wallet._
+import com.fluency03.blockchain.core.SingleWallet._
 
 import org.scalatest.{FlatSpec, Matchers}
 
 import scala.collection.mutable
 
-class WalletTest extends FlatSpec with Matchers {
+class SingleWalletTest extends FlatSpec with Matchers {
 
   "balanceOfWallet" should "obtain the balance of a Wallet based on UTXOs." in {
-    val wallet = Wallet()
+    val wallet = SingleWallet()
     val uTxOs: mutable.Map[Outpoint, TxOut] = mutable.Map.empty[Outpoint, TxOut]
 
     balanceOfWallet(wallet, uTxOs) shouldEqual 0
@@ -24,7 +24,7 @@ class WalletTest extends FlatSpec with Matchers {
   }
 
   "Wallet" should "be able to sign a TxIn." in {
-    val wallet = Wallet()
+    val wallet = SingleWallet()
     val id = "".toSha256
     val txIn = TxIn(Outpoint("def0", 0), "abc")
     val uTxOs: mutable.Map[Outpoint, TxOut] = mutable.Map.empty[Outpoint, TxOut]