[ETCM-868] fix storeGenesisAccountStorageData and stSpecialTest

Aurélien Richez · Aurélien Richez · commit faf3422824b5 · 2021-05-26T12:07:28.000+02:00
diff --git a/src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala b/src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala
@@ -181,7 +181,10 @@ class TestService(
       Account.EmptyStorageRootHash,
       blockchain.getStateStorage.getBackingStorage(0)
     )
-    val storagesToPersist = accounts.map(pair => pair._2.storage).collect { case Some(map) if map.nonEmpty => map }
+    val storagesToPersist = accounts
+      .flatMap(pair => pair._2.storage)
+      .map(accountStorage => accountStorage.filterNot { case (_, v) => v.isZero })
+      .filter(_.nonEmpty)
     for { storage <- storagesToPersist } {
       storage.foldLeft(emptyStorage) { case (storage, (key, value)) => storage.put(key, value) }
     }

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,10 @@ class TestService(`
`181`	`181`	`Account.EmptyStorageRootHash,`
`182`	`182`	`blockchain.getStateStorage.getBackingStorage(0)`
`183`	`183`	`)`
`184`		`- val storagesToPersist = accounts.map(pair => pair._2.storage).collect { case Some(map) if map.nonEmpty => map }`
	`184`	`+ val storagesToPersist = accounts`
	`185`	`+ .flatMap(pair => pair._2.storage)`
	`186`	`+ .map(accountStorage => accountStorage.filterNot { case (_, v) => v.isZero })`
	`187`	`+ .filter(_.nonEmpty)`
`185`	`188`	`for { storage <- storagesToPersist } {`
`186`	`189`	`storage.foldLeft(emptyStorage) { case (storage, (key, value)) => storage.put(key, value) }`
`187`	`190`	`}`