StakeSquid/dshackle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn off caches for main, fix cache not enrichment blocks (#160)

Browse Source
This commit is contained in:
KirillPamPam
2023-03-15 13:38:07 +04:00
committed by GitHub
parent 26d518d98e
commit a0dfb86c54
9 changed files with 77 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/test/groovy/io/emeraldpay/dshackle/cache/BlockByHeightSpec.groovy vendored
View File

@@ -19,7 +19,9 @@ import com.fasterxml.jackson.databind.ObjectMapper
import io.emeraldpay.dshackle.Global
import io.emeraldpay.dshackle.data.BlockContainer
import io.emeraldpay.etherjar.domain.BlockHash
import io.emeraldpay.etherjar.domain.TransactionId
import io.emeraldpay.etherjar.rpc.json.BlockJson
import io.emeraldpay.etherjar.rpc.json.TransactionJson
import io.emeraldpay.etherjar.rpc.json.TransactionRefJson
import spock.lang.Specification
@@ -39,12 +41,14 @@ class BlockByHeightSpec extends Specification {
def heights = new HeightCache()
def block = new BlockJson<TransactionRefJson>()
def tx = new TransactionJson()
tx.hash = TransactionId.from(hash1)
block.number = 100
block.hash = BlockHash.from(hash1)
block.totalDifficulty = BigInteger.ONE
block.timestamp = Instant.now().truncatedTo(ChronoUnit.SECONDS)
block.uncles = []
block.transactions = []
block.transactions = List.of(tx)
BlockContainer.from(block).with {
blocks.add(it)
@@ -65,12 +69,14 @@ class BlockByHeightSpec extends Specification {
def heights = new HeightCache()
def block1 = new BlockJson<TransactionRefJson>()
def tx = new TransactionJson()
tx.hash = TransactionId.from(hash1)
block1.number = 100
block1.hash = BlockHash.from(hash1)
block1.totalDifficulty = BigInteger.ONE
block1.timestamp = Instant.now().truncatedTo(ChronoUnit.SECONDS)
block1.uncles = []
block1.transactions = []
block1.transactions = List.of(tx)
def block2 = new BlockJson<TransactionRefJson>()
block2.number = 101
@@ -78,7 +84,7 @@ class BlockByHeightSpec extends Specification {
block2.totalDifficulty = BigInteger.ONE
block2.timestamp = Instant.now().truncatedTo(ChronoUnit.SECONDS)
block2.uncles = []
block2.transactions = []
block2.transactions = List.of(tx)
BlockContainer.from(block1).with {
@@ -109,12 +115,14 @@ class BlockByHeightSpec extends Specification {
def heights = new HeightCache()
def block1 = new BlockJson<TransactionRefJson>()
def tx = new TransactionJson()
tx.hash = TransactionId.from(hash1)
block1.number = 100
block1.hash = BlockHash.from(hash1)
block1.totalDifficulty = BigInteger.ONE
block1.timestamp = Instant.now().truncatedTo(ChronoUnit.SECONDS)
block1.uncles = []
block1.transactions = []
block1.transactions = List.of(tx)
def block2 = new BlockJson<TransactionRefJson>()
block2.number = 100
@@ -122,7 +130,7 @@ class BlockByHeightSpec extends Specification {
block2.totalDifficulty = BigInteger.ONE
block2.timestamp = Instant.now().truncatedTo(ChronoUnit.SECONDS)
block2.uncles = []
block2.transactions = []
block2.transactions = List.of(tx)
BlockContainer.from(block1).with {
blocks.add(it)

28
src/test/groovy/io/emeraldpay/dshackle/cache/BlocksMemCacheSpec.groovy vendored
View File

@@ -21,7 +21,9 @@ import io.emeraldpay.dshackle.Global
import io.emeraldpay.dshackle.data.BlockContainer
import io.emeraldpay.dshackle.data.BlockId
import io.emeraldpay.etherjar.domain.BlockHash
import io.emeraldpay.etherjar.domain.TransactionId
import io.emeraldpay.etherjar.rpc.json.BlockJson
import io.emeraldpay.etherjar.rpc.json.TransactionJson
import io.emeraldpay.etherjar.rpc.json.TransactionRefJson
import spock.lang.Specification
@@ -39,12 +41,14 @@ class BlocksMemCacheSpec extends Specification {
setup:
def cache = new BlocksMemCache()
def block = new BlockJson<TransactionRefJson>()
def tx = new TransactionJson()
tx.hash = TransactionId.from(hash1)
block.number = 100
block.hash = BlockHash.from(hash1)
block.totalDifficulty = BigInteger.ONE
block.timestamp = Instant.now().truncatedTo(ChronoUnit.SECONDS)
block.uncles = []
block.transactions = []
block.transactions = List.of(tx)
when:
cache.add(BlockContainer.from(block))
@@ -61,12 +65,14 @@ class BlocksMemCacheSpec extends Specification {
when:
[hash1, hash2, hash3, hash4].eachWithIndex { String hash, int i ->
def block = new BlockJson<TransactionRefJson>()
def tx = new TransactionJson()
tx.hash = TransactionId.from(hash1)
block.number = 100 + i
block.hash = BlockHash.from(hash)
block.totalDifficulty = BigInteger.ONE
block.timestamp = Instant.now()
block.uncles = []
block.transactions = []
block.transactions = List.of(tx)
cache.add(BlockContainer.from(block))
}
@@ -83,4 +89,22 @@ class BlocksMemCacheSpec extends Specification {
act1 == null
}
def "Try add not full block and read"() {
setup:
def cache = new BlocksMemCache()
def block = new BlockJson<TransactionRefJson>()
block.number = 100
block.hash = BlockHash.from(hash1)
block.totalDifficulty = BigInteger.ONE
block.timestamp = Instant.now().truncatedTo(ChronoUnit.SECONDS)
block.uncles = []
block.transactions = []
when:
cache.add(BlockContainer.from(block))
def act = cache.read(BlockId.from(hash1)).block()
then:
act == null
}
}

24
src/test/groovy/io/emeraldpay/dshackle/upstream/calls/EthereumCallSelectorSpec.groovy
View File

@@ -15,9 +15,9 @@
*/
package io.emeraldpay.dshackle.upstream.calls
import io.emeraldpay.dshackle.cache.BlocksMemCache
import io.emeraldpay.dshackle.cache.Caches
import io.emeraldpay.dshackle.data.BlockContainer
import io.emeraldpay.dshackle.cache.HeightByHashMemCache
import io.emeraldpay.dshackle.data.BlockId
import io.emeraldpay.dshackle.reader.Reader
import io.emeraldpay.dshackle.upstream.Head
@@ -27,7 +27,6 @@ import reactor.test.StepVerifier
import spock.lang.Specification
import java.time.Duration
import java.time.Instant
class EthereumCallSelectorSpec extends Specification {
@@ -233,14 +232,12 @@ class EthereumCallSelectorSpec extends Specification {
def "Get height matcher for getByHash and getTransactionByBlockHash methods"() {
setup:
def hash = "0xa6af163aab691919c595e2a466f0a7b01f1dff8cfd9631dee811df57064c2d32"
def block = new BlockContainer(
12079192L, BlockId.from(hash),
BigInteger.ONE, Instant.now(), false, "".bytes, null, [], 0, "upstream"
)
def blockByHashCache = Mock(BlocksMemCache) {
1 * read(BlockId.from(hash)) >> Mono.just(block)
def blockHeight = 12079192L
def cache = Mock(Caches) { caches ->
1 * caches.getLastHeightByHash() >> Mock(HeightByHashMemCache) { memCache ->
1 * memCache.read(BlockId.from(hash)) >> Mono.just(blockHeight)
}
}
def cache = Caches.newBuilder().setBlockByHash(blockByHashCache).build()
def callSelector = new EthereumCallSelector(Stub(Reader), cache)
def head = Stub(Head)
@@ -318,10 +315,11 @@ class EthereumCallSelectorSpec extends Specification {
def "No height matcher for getByHash method"() {
setup:
def hash = "0xa6af163aab691919c595e2a466f0a7b01f1dff8cfd9631dee811df57064c2d32"
def blockByHashCache = Mock(BlocksMemCache) {
1 * read(BlockId.from(hash)) >> resultFromCache
def cache = Mock(Caches) { caches ->
1 * caches.getLastHeightByHash() >> Mock(HeightByHashMemCache) { memCache ->
1 * memCache.read(BlockId.from(hash)) >> resultFromCache
}
}
def cache = Caches.newBuilder().setBlockByHash(blockByHashCache).build()
def callSelector = new EthereumCallSelector(Stub(Reader), cache)
def head = Stub(Head)