Merge pull request #926 from input-output-hk/ETCM-468-complement-tests

ETCM-468-complement get proof service tests

Author: bsuieric

src/test/scala/io/iohk/ethereum/jsonrpc/EthProofServiceSpec.scala

@@ -27,6 +27,7 @@ import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.flatspec.AnyFlatSpecLike
 import org.scalatest.matchers.should.Matchers
 import io.iohk.ethereum.mpt.MerklePatriciaTrie.defaultByteArraySerializable
+import io.iohk.ethereum.rlp.RLPValue
 
 class EthProofServiceSpec
     extends TestKit(ActorSystem("EthGetProofSpec_ActorSystem"))
@@ -95,11 +96,22 @@ class EthProofServiceSpec
     result.isRight shouldBe true
     result.fold(
       l => l,
-      r =>
-        r.proofAccount.storageProof.map(v => {
+      r => {
+        val accountProof = r.proofAccount
+        accountProof.address should matchTo(address)
+        accountProof.accountProof.foreach { p =>
+          p should not be empty
+        }
+        accountProof.accountProof.head shouldBe rlp.encode(RLPValue(mpt.getRootHash))
+        accountProof.balance shouldBe balance.toBigInt
+        accountProof.codeHash shouldBe account.codeHash
+        accountProof.nonce shouldBe nonce
+        accountProof.storageHash shouldBe account.storageRoot
+        accountProof.storageProof.map(v => {
           v.proof.nonEmpty shouldBe true
           v.value shouldBe BigInt(0)
         })
+      }
     )
   }
 
@@ -109,11 +121,22 @@ class EthProofServiceSpec
     result.isRight shouldBe true
     result.fold(
       l => l,
-      r =>
+      r => {
+        val accountProof = r.proofAccount
+        accountProof.address should matchTo(address)
+        accountProof.accountProof.foreach { p =>
+          p should not be empty
+        }
+        accountProof.accountProof.head shouldBe rlp.encode(RLPValue(mpt.getRootHash))
+        accountProof.balance shouldBe balance.toBigInt
+        accountProof.codeHash shouldBe account.codeHash
+        accountProof.nonce shouldBe nonce
+        accountProof.storageHash shouldBe account.storageRoot
         r.proofAccount.storageProof.map(v => {
           v.proof.nonEmpty shouldBe true
           v.value shouldBe BigInt(value)
         })
+      }
     )
   }
 
@@ -125,8 +148,18 @@ class EthProofServiceSpec
     result.fold(
       l => l,
       r => {
-        r.proofAccount.storageProof.size shouldBe 2
-        r.proofAccount.storageProof.map(v => {
+        val accountProof = r.proofAccount
+        accountProof.address should matchTo(address)
+        accountProof.accountProof.foreach { p =>
+          p should not be empty
+        }
+        accountProof.accountProof.head shouldBe rlp.encode(RLPValue(mpt.getRootHash))
+        accountProof.balance shouldBe balance.toBigInt
+        accountProof.codeHash shouldBe account.codeHash
+        accountProof.nonce shouldBe nonce
+        accountProof.storageHash shouldBe account.storageRoot
+        accountProof.storageProof.size shouldBe 2
+        accountProof.storageProof.map(v => {
           v.proof.nonEmpty shouldBe true
           expectedValueStorageKey should contain(v.value)
         })
@@ -143,8 +176,39 @@ class EthProofServiceSpec
     result.fold(
       l => l,
       r => {
-        r.proofAccount.storageProof.size shouldBe 3
-        expectedValueStorageKey.forall(r.proofAccount.storageProof.map(_.value).contains) shouldBe true
+        val accountProof = r.proofAccount
+        accountProof.address should matchTo(address)
+        accountProof.accountProof.foreach { p =>
+          p should not be empty
+        }
+        accountProof.accountProof.head shouldBe rlp.encode(RLPValue(mpt.getRootHash))
+        accountProof.balance shouldBe balance.toBigInt
+        accountProof.codeHash shouldBe account.codeHash
+        accountProof.nonce shouldBe nonce
+        accountProof.storageHash shouldBe account.storageRoot
+        accountProof.storageProof.size shouldBe 3
+        expectedValueStorageKey.forall(accountProof.storageProof.map(_.value).contains) shouldBe true
+      }
+    )
+  }
+
+  "EthProofService" should "return account proof and account details, with empty storage proof" in new TestSetup {
+    val result = fetchProof(address, Seq.empty, blockNumber).runSyncUnsafe()
+    result.isRight shouldBe true
+    result.fold(
+      l => l,
+      r => {
+        val accountProof = r.proofAccount
+        accountProof.address should matchTo(address)
+        accountProof.accountProof.foreach { p =>
+          p should not be empty
+        }
+        accountProof.accountProof.head shouldBe rlp.encode(RLPValue(mpt.getRootHash))
+        accountProof.balance shouldBe balance.toBigInt
+        accountProof.codeHash shouldBe account.codeHash
+        accountProof.nonce shouldBe nonce
+        accountProof.storageHash shouldBe account.storageRoot
+        accountProof.storageProof.size shouldBe 0
       }
     )
   }
@@ -153,6 +217,8 @@ class EthProofServiceSpec
 
     val blockGenerator = mock[EthashBlockGenerator]
     val address = Address(ByteString(Hex.decode("abbb6bebfa05aa13e908eaa492bd7a8343760477")))
+    val balance = UInt256(0)
+    val nonce = 0
 
     val key = 333
     val value = 123
@@ -171,8 +237,8 @@ class EthProofServiceSpec
       .put(UInt256(key2), UInt256(value2))
 
     val account = Account(
-      nonce = 0,
-      balance = UInt256(0),
+      nonce = nonce,
+      balance = balance,
       storageRoot = ByteString(storageMpt.getRootHash)
     )
 
@@ -202,8 +268,8 @@ class EthProofServiceSpec
         blockNumber: BlockParam
     ): ServiceResponse[ProofService.GetProofResponse] = {
       val request = GetProofRequest(address, storageKeys, blockNumber)
-      val retrievedAccountProofWrong: ServiceResponse[ProofService.GetProofResponse] = ethGetProof.getProof(request)
-      retrievedAccountProofWrong
+      val retrievedAccountProof: ServiceResponse[ProofService.GetProofResponse] = ethGetProof.getProof(request)
+      retrievedAccountProof
     }
 
     val ethUserService = new EthUserService(