Merge pull request #601 from wavesplatform/node-274-fix-generator-add…

…ress-in-block-json Corrected string representation of PublicKeyAccount
wavesplatform · Oct 16, 2017 · eb508c2 · eb508c2
2 parents d35f716 + c619736
commit eb508c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/scala/scorex/account/PublicKeyAccount.scala b/src/main/scala/scorex/account/PublicKeyAccount.scala
@@ -1,6 +1,5 @@
 package scorex.account
 
-import com.wavesplatform.state2.ByteStr
 import scorex.crypto.encode.Base58
 import scorex.transaction.ValidationError.InvalidAddress
 import scorex.transaction.{TransactionParser, ValidationError}
@@ -15,7 +14,7 @@ trait PublicKeyAccount {
 
   override def hashCode(): Int = publicKey.hashCode()
 
-  override lazy val toString: String = ByteStr.apply(this.publicKey).base58
+  override lazy val toString: String = this.toAddress.address
 }
 
 object PublicKeyAccount {

diff --git a/src/test/scala/scorex/account/AccountSpecification.scala b/src/test/scala/scorex/account/AccountSpecification.scala
@@ -15,5 +15,12 @@ class AccountSpecification extends PropSpec with PropertyChecks with GeneratorDr
       Address.fromString(addressVersion2).isRight shouldBe (AddressVersion2 == Address.AddressVersion)
     }
   }
+
+  property("PublicKeyAccount should return Address as it's string representation") {
+    forAll { bytes: Array[Byte] =>
+      val a = PublicKeyAccount.apply(bytes)
+      a.toString shouldBe a.toAddress.address
+    }
+  }
 }