Skip to content

Commit 9a3e397

Browse files
glyhdkijania
authored andcommitted
patch mina-verify-packaged-fork-config to not use ldb as it's version doesn't match up with Mina's statically linked one
1 parent cb85412 commit 9a3e397

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

scripts/hardfork/mina-verify-packaged-fork-config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ MINA_EXE=${MINA_EXE:-$(source_build_fallback mina ./_build/default/src/app/cli/s
5656
MINA_GENESIS_EXE=${MINA_GENESIS_EXE:-$(source_build_fallback mina-create-genesis ./_build/default/src/app/runtime_genesis_ledger/runtime_genesis_ledger.exe)}
5757
MINA_LEGACY_GENESIS_EXE=${MINA_LEGACY_GENESIS_EXE:-$(source_build_fallback mina-create-legacy-genesis ./runtime_genesis_ledger_of_mainnet.exe)}
5858
CREATE_RUNTIME_CONFIG=${CREATE_RUNTIME_CONFIG:-$(source_build_fallback mina-hf-create-runtime-config ./scripts/hardfork/create_runtime_config.sh)}
59+
MINA_ROCKSDB_SCANNER=${MINA_ROCKSDB_SCANNER:-$(source_build_fallback mina-rocksdb-scanner ./_build/default/src/app/rocksdb-scanner/rocksdb_scanner.exe)}
5960
GSUTIL=${GSUTIL:-$(command -v gsutil || echo "")}
6061

6162
if [[ ! -e "$PRECOMPUTED_FORK_BLOCK" && ( -z "$GSUTIL" || ! -x "$GSUTIL" ) ]]; then
@@ -206,7 +207,6 @@ for file in "$workdir"/packaged-*.json; do
206207
fi
207208
done
208209

209-
ldb_cmd=$(command -v rocksdb-ldb || command -v rocksdb_ldb || command -v ldb)
210210
for file in "$workdir"/ledgers/*.tar.gz; do
211211
tarname=$(basename "$file")
212212
tarname=${tarname%.tar.gz}
@@ -218,9 +218,9 @@ for file in "$workdir"/ledgers/*.tar.gz; do
218218
base_s3_url="${MINA_LEDGER_S3_BUCKET:-https://s3-us-west-2.amazonaws.com/snark-keys-ro.o1test.net}"
219219
curl "$base_s3_url/$tarname.tar.gz" | tar -xz -C "$tardir/web"
220220

221-
$ldb_cmd --hex --db="$tardir/packaged" scan > "$workdir/packaged.scan"
222-
$ldb_cmd --hex --db="$tardir/web" scan > "$workdir/web.scan"
223-
$ldb_cmd --hex --db="$tardir/generated" scan > "$workdir/generated.scan"
221+
for kind in {packaged,web,generated}; do
222+
$MINA_ROCKSDB_SCANNER --db-path "$tardir/$kind" --output-file "$workdir/$kind.scan"
223+
done
224224

225225
if ! cmp "$workdir/generated.scan" "$workdir/packaged.scan" || ! cmp "$workdir/packaged.scan" "$workdir/web.scan"; then
226226
echo "Error: kvdb contents mismatch for $tarname" >&2

0 commit comments

Comments
 (0)