Remove FullBlock and Transaction(s) from SPV models. Use sdk models i…

…nstead.
VeriBlock · Aug 15, 2022 · 12a5945 · 12a5945
1 parent e887189
commit 12a5945
Show file tree

Hide file tree

Showing 22 changed files with 33 additions and 537 deletions.
diff --git a/altchain-plugins/src/main/kotlin/org/veriblock/alt/plugins/ethereum/EthereumFamilyChain.kt b/altchain-plugins/src/main/kotlin/org/veriblock/alt/plugins/ethereum/EthereumFamilyChain.kt
@@ -325,22 +325,10 @@ class EthereumFamilyChain(
     }
 
     override suspend fun getVbkBlock(hash: String): VbkBlockResponse? {
-        val response = rpcRequest<EthGetVbkBlockResponse>(
+        return rpcRequest<VbkBlockResponse>(
             method="pop_getVbkBlockByHash",
             params = listOf(hash),
             version = "2.0")
-
-        return VbkBlockResponse(
-            chainWork = response.chainWork,
-            containingEndorsements = response.containingEndorsements,
-            endorsedBy = response.endorsedBy,
-            blockOfProofEndorsements = response.blockOfProofEndorsements,
-            height = response.height,
-            header = response.header.toVbkBlock(),
-            status = response.status,
-            altrefs = response.altrefs,
-            stored = StoredInVbkBlockData(response.stored.vtbids)
-        )
     }
 
     override suspend fun getVbkBlockHash(height: Int): String? {

diff --git a/nodecore-spv/src/main/java/org/veriblock/spv/model/FullBlock.kt b/nodecore-spv/src/main/java/org/veriblock/spv/model/FullBlock.kt
diff --git a/nodecore-spv/src/main/java/org/veriblock/spv/model/PopTransactionLight.kt b/nodecore-spv/src/main/java/org/veriblock/spv/model/PopTransactionLight.kt
diff --git a/nodecore-spv/src/main/java/org/veriblock/spv/model/StandardTransaction.kt b/nodecore-spv/src/main/java/org/veriblock/spv/model/StandardTransaction.kt
diff --git a/nodecore-spv/src/main/java/org/veriblock/spv/model/Transaction.kt b/nodecore-spv/src/main/java/org/veriblock/spv/model/Transaction.kt
diff --git a/nodecore-spv/src/main/java/org/veriblock/spv/net/PeerEventListener.kt b/nodecore-spv/src/main/java/org/veriblock/spv/net/PeerEventListener.kt
@@ -51,9 +51,7 @@ import org.veriblock.sdk.models.VeriBlockBlock
 import org.veriblock.sdk.services.SerializeDeserializeService
 import org.veriblock.spv.SpvContext
 import org.veriblock.spv.SpvState
-import org.veriblock.spv.model.Transaction
 import org.veriblock.spv.model.TransactionTypeIdentifier
-import org.veriblock.spv.serialization.MessageSerializer
 import org.veriblock.spv.service.Blockchain
 import org.veriblock.spv.service.NetworkBlock
 import org.veriblock.spv.service.PendingTransactionContainer