beacon_chain_db: proc -> func (#3931)

This commit is contained in:
tersec 2022-08-01 16:17:06 +00:00 committed by GitHub
parent 73900172cb
commit 2240594ed8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions

View File

@ -834,7 +834,7 @@ proc getPhase0BlockSSZ(
db: BeaconChainDBV0, key: Eth2Digest, data: var seq[byte]): bool = db: BeaconChainDBV0, key: Eth2Digest, data: var seq[byte]): bool =
let dataPtr = addr data # Short-lived let dataPtr = addr data # Short-lived
var success = true var success = true
proc decode(data: openArray[byte]) = func decode(data: openArray[byte]) =
try: dataPtr[] = snappy.decode(data, maxDecompressedDbRecordSize) try: dataPtr[] = snappy.decode(data, maxDecompressedDbRecordSize)
except CatchableError: success = false except CatchableError: success = false
db.backend.get(subkey(phase0.SignedBeaconBlock, key), decode).expectDb() and db.backend.get(subkey(phase0.SignedBeaconBlock, key), decode).expectDb() and
@ -844,7 +844,7 @@ proc getPhase0BlockSZ(
db: BeaconChainDBV0, key: Eth2Digest, data: var seq[byte]): bool = db: BeaconChainDBV0, key: Eth2Digest, data: var seq[byte]): bool =
let dataPtr = addr data # Short-lived let dataPtr = addr data # Short-lived
var success = true var success = true
proc decode(data: openArray[byte]) = func decode(data: openArray[byte]) =
try: dataPtr[] = snappy.encodeFramed( try: dataPtr[] = snappy.encodeFramed(
snappy.decode(data, maxDecompressedDbRecordSize)) snappy.decode(data, maxDecompressedDbRecordSize))
except CatchableError: success = false except CatchableError: success = false
@ -857,7 +857,7 @@ proc getBlockSSZ*(
T: type phase0.TrustedSignedBeaconBlock): bool = T: type phase0.TrustedSignedBeaconBlock): bool =
let dataPtr = addr data # Short-lived let dataPtr = addr data # Short-lived
var success = true var success = true
proc decode(data: openArray[byte]) = func decode(data: openArray[byte]) =
try: dataPtr[] = snappy.decode(data, maxDecompressedDbRecordSize) try: dataPtr[] = snappy.decode(data, maxDecompressedDbRecordSize)
except CatchableError: success = false except CatchableError: success = false
db.blocks[BeaconBlockFork.Phase0].get(key.data, decode).expectDb() and success or db.blocks[BeaconBlockFork.Phase0].get(key.data, decode).expectDb() and success or
@ -868,7 +868,7 @@ proc getBlockSSZ*(
T: type altair.TrustedSignedBeaconBlock): bool = T: type altair.TrustedSignedBeaconBlock): bool =
let dataPtr = addr data # Short-lived let dataPtr = addr data # Short-lived
var success = true var success = true
proc decode(data: openArray[byte]) = func decode(data: openArray[byte]) =
try: dataPtr[] = snappy.decode(data, maxDecompressedDbRecordSize) try: dataPtr[] = snappy.decode(data, maxDecompressedDbRecordSize)
except CatchableError: success = false except CatchableError: success = false
db.blocks[T.toFork].get(key.data, decode).expectDb() and success db.blocks[T.toFork].get(key.data, decode).expectDb() and success
@ -878,7 +878,7 @@ proc getBlockSSZ*(
T: type bellatrix.TrustedSignedBeaconBlock): bool = T: type bellatrix.TrustedSignedBeaconBlock): bool =
let dataPtr = addr data # Short-lived let dataPtr = addr data # Short-lived
var success = true var success = true
proc decode(data: openArray[byte]) = func decode(data: openArray[byte]) =
try: dataPtr[] = decodeFramed(data) try: dataPtr[] = decodeFramed(data)
except CatchableError: success = false except CatchableError: success = false
db.blocks[T.toFork].get(key.data, decode).expectDb() and success db.blocks[T.toFork].get(key.data, decode).expectDb() and success
@ -899,7 +899,7 @@ proc getBlockSZ*(
T: type phase0.TrustedSignedBeaconBlock): bool = T: type phase0.TrustedSignedBeaconBlock): bool =
let dataPtr = addr data # Short-lived let dataPtr = addr data # Short-lived
var success = true var success = true
proc decode(data: openArray[byte]) = func decode(data: openArray[byte]) =
try: dataPtr[] = snappy.encodeFramed( try: dataPtr[] = snappy.encodeFramed(
snappy.decode(data, maxDecompressedDbRecordSize)) snappy.decode(data, maxDecompressedDbRecordSize))
except CatchableError: success = false except CatchableError: success = false
@ -911,7 +911,7 @@ proc getBlockSZ*(
T: type altair.TrustedSignedBeaconBlock): bool = T: type altair.TrustedSignedBeaconBlock): bool =
let dataPtr = addr data # Short-lived let dataPtr = addr data # Short-lived
var success = true var success = true
proc decode(data: openArray[byte]) = func decode(data: openArray[byte]) =
try: dataPtr[] = snappy.encodeFramed( try: dataPtr[] = snappy.encodeFramed(
snappy.decode(data, maxDecompressedDbRecordSize)) snappy.decode(data, maxDecompressedDbRecordSize))
except CatchableError: success = false except CatchableError: success = false
@ -922,7 +922,7 @@ proc getBlockSZ*(
T: type bellatrix.TrustedSignedBeaconBlock): bool = T: type bellatrix.TrustedSignedBeaconBlock): bool =
let dataPtr = addr data # Short-lived let dataPtr = addr data # Short-lived
var success = true var success = true
proc decode(data: openArray[byte]) = func decode(data: openArray[byte]) =
assign(dataPtr[], data) assign(dataPtr[], data)
db.blocks[T.toFork].get(key.data, decode).expectDb() and success db.blocks[T.toFork].get(key.data, decode).expectDb() and success