make some 'beginTransaction' usages safer
This commit is contained in:
parent
b8ada41ce0
commit
48cdc6da0b
|
@ -19,8 +19,9 @@ proc executeBlock(blockEnv: JsonNode, memoryDB: TrieDatabaseRef, blockNumber: Ui
|
||||||
header = chainDB.getBlockHeader(blockNumber)
|
header = chainDB.getBlockHeader(blockNumber)
|
||||||
body = chainDB.getBlockBody(header.blockHash)
|
body = chainDB.getBlockBody(header.blockHash)
|
||||||
|
|
||||||
|
let transaction = memoryDB.beginTransaction()
|
||||||
|
defer: transaction.dispose()
|
||||||
let
|
let
|
||||||
transaction = memoryDB.beginTransaction()
|
|
||||||
vmState = newBaseVMState(parent, chainDB)
|
vmState = newBaseVMState(parent, chainDB)
|
||||||
validationResult = processBlock(chainDB, parent, header, body, vmState)
|
validationResult = processBlock(chainDB, parent, header, body, vmState)
|
||||||
|
|
||||||
|
@ -29,9 +30,6 @@ proc executeBlock(blockEnv: JsonNode, memoryDB: TrieDatabaseRef, blockNumber: Ui
|
||||||
else:
|
else:
|
||||||
info "block validation success", validationResult, blockNumber
|
info "block validation success", validationResult, blockNumber
|
||||||
|
|
||||||
# success or not dispose it
|
|
||||||
transaction.dispose()
|
|
||||||
|
|
||||||
dumpDebuggingMetaData(chainDB, header, body, vmState, false)
|
dumpDebuggingMetaData(chainDB, header, body, vmState, false)
|
||||||
let
|
let
|
||||||
fileName = "debug" & $blockNumber & ".json"
|
fileName = "debug" & $blockNumber & ".json"
|
||||||
|
|
|
@ -16,8 +16,9 @@ proc dumpDebug(chainDB: BaseChainDB, blockNumber: Uint256) =
|
||||||
captureTrieDB = trieDB captureDB
|
captureTrieDB = trieDB captureDB
|
||||||
captureChainDB = newBaseChainDB(captureTrieDB, false)
|
captureChainDB = newBaseChainDB(captureTrieDB, false)
|
||||||
|
|
||||||
|
let transaction = memoryDB.beginTransaction()
|
||||||
|
defer: transaction.dispose()
|
||||||
let
|
let
|
||||||
transaction = memoryDB.beginTransaction()
|
|
||||||
parentNumber = blockNumber - 1
|
parentNumber = blockNumber - 1
|
||||||
parent = captureChainDB.getBlockHeader(parentNumber)
|
parent = captureChainDB.getBlockHeader(parentNumber)
|
||||||
header = captureChainDB.getBlockHeader(blockNumber)
|
header = captureChainDB.getBlockHeader(blockNumber)
|
||||||
|
@ -28,8 +29,6 @@ proc dumpDebug(chainDB: BaseChainDB, blockNumber: Uint256) =
|
||||||
captureChainDB.setHead(parent, true)
|
captureChainDB.setHead(parent, true)
|
||||||
let validationResult = processBlock(captureChainDB, parent, header, body, vmState)
|
let validationResult = processBlock(captureChainDB, parent, header, body, vmState)
|
||||||
|
|
||||||
# success or not dispose it
|
|
||||||
transaction.dispose()
|
|
||||||
dumpDebuggingMetaData(captureChainDB, header, body, vmState, false)
|
dumpDebuggingMetaData(captureChainDB, header, body, vmState, false)
|
||||||
|
|
||||||
proc main() =
|
proc main() =
|
||||||
|
|
|
@ -68,13 +68,13 @@ proc huntProblematicBlock(blockNumber: Uint256): ValidationResult =
|
||||||
|
|
||||||
chainDB.setHead(parentBlock.header, true)
|
chainDB.setHead(parentBlock.header, true)
|
||||||
|
|
||||||
|
let transaction = memoryDB.beginTransaction()
|
||||||
|
defer: transaction.dispose()
|
||||||
let
|
let
|
||||||
transaction = memoryDB.beginTransaction()
|
|
||||||
vmState = newBaseVMState(parentBlock.header, chainDB)
|
vmState = newBaseVMState(parentBlock.header, chainDB)
|
||||||
validationResult = processBlock(chainDB, parentBlock.header, thisBlock.header, thisBlock.body, vmState)
|
validationResult = processBlock(chainDB, parentBlock.header, thisBlock.header, thisBlock.body, vmState)
|
||||||
|
|
||||||
if validationResult != ValidationResult.OK:
|
if validationResult != ValidationResult.OK:
|
||||||
transaction.dispose()
|
|
||||||
dumpDebuggingMetaData(chainDB, thisBlock.header, thisBlock.body, vmState, false)
|
dumpDebuggingMetaData(chainDB, thisBlock.header, thisBlock.body, vmState, false)
|
||||||
|
|
||||||
result = validationResult
|
result = validationResult
|
||||||
|
|
Loading…
Reference in New Issue