Problem: recent fixdata fixes are not included (#1749)

* Problem: miss diff info when assert from test utils (#1745)

* Problem: miss diff info when assert from test utils

* align rootdir

* fix upload

* Problem: batch initialization when fixdata with dry-run is unnecessary (#1747)

* Problem: need batch initialization run fixdata with dry-run

* mod tidy

* skip flush

* Problem: need run fixdata multiple times when no timestamp checking

query with GetCFWithTS to compare both timestamp and key

Author: mmsqe

.github/workflows/test.yml

@@ -65,7 +65,7 @@ jobs:
         if: steps.changed-files.outputs.only_changed == 'false'
         run: |
           nix profile install ./nix#go_1_22
-          go tool covdata textfmt -i=integration_tests/coverage -o profile.txt
+          go tool covdata textfmt -i=coverage -o profile.txt
       - name: Upload coverage report
         if: steps.changed-files.outputs.only_changed == 'false'
         uses: codecov/codecov-action@v4

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## UNRELEASED
+
+### Bug Fixes
+
+* [#1748](https://github.com/crypto-org-chain/cronos/pull/1748) Query with GetCFWithTS to compare both timestamp and key to avoid run fixdata multiple times.
+
+### Improvements
+
+* [#1747](https://github.com/crypto-org-chain/cronos/pull/1747) Skip batch initialization and flush when fixdata with dry-run.
+
 *Feb 3, 2025*
 
 ## v1.4.3
@@ -31,6 +41,7 @@
 ### Improvements
 
 * [#1712](https://github.com/crypto-org-chain/cronos/pull/1712) Upgrade rocksdb to `v9.8.4`.
+* [#1747](https://github.com/crypto-org-chain/cronos/pull/1747) Skip batch initialization and flush when fixdata with dry-run.
 
 *Dec 2, 2024*
 

Makefile

@@ -240,7 +240,7 @@ TESTS_TO_RUN ?= all
 
 run-integration-tests:
 	@make gen-bindings-contracts
-	@nix-shell ./integration_tests/shell.nix --run ./scripts/run-integration-tests
+	@./scripts/run-integration-tests
 
 .PHONY: run-integration-tests
 

go.mod

@@ -56,7 +56,7 @@ require (
 	cloud.google.com/go/storage v1.41.0 // indirect
 	cosmossdk.io/collections v0.4.0 // indirect
 	cosmossdk.io/depinject v1.0.0 // indirect
-	cosmossdk.io/x/tx v0.13.6-0.20241003112805-ff8789a02871 // indirect
+	cosmossdk.io/x/tx v0.13.7 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/DataDog/datadog-go v4.8.3+incompatible // indirect

gomod2nix.toml

@@ -1,2 +1,3 @@
 [pytest]
 addopts = --ignore=contracts
+python_files = integration_tests/*.py

integration_tests/pytest.ini

@@ -9,7 +9,7 @@ echo "build test contracts"
 cd ../integration_tests/contracts
 HUSKY_SKIP_INSTALL=1 npm install
 npm run typechain
-cd ..
+cd ../..
 TESTS_TO_RUN="${TESTS_TO_RUN:-all}"
 if [[ "$TESTS_TO_RUN" == "all" ]]; then
   echo "run all tests"
@@ -18,4 +18,4 @@ else
   echo "run tests matching $TESTS_TO_RUN"
   cmd="pytest -vv -s --session-timeout=1800 --timeout=1800 -m '$TESTS_TO_RUN'"
 fi
-nix-shell --run "$cmd"
+nix-shell ./integration_tests/shell.nix --run "$cmd"

scripts/run-integration-tests

@@ -241,7 +241,9 @@ func (s Store) FixData(storeNames []string, dryRun bool) error {
 			return err
 		}
 	}
-
+	if dryRun {
+		return nil
+	}
 	return s.Flush()
 }
 
@@ -252,8 +254,11 @@ func (s Store) fixDataStore(storeName string, dryRun bool) error {
 		return err
 	}
 
-	batch := grocksdb.NewWriteBatch()
-	defer batch.Destroy()
+	var batch *grocksdb.WriteBatch
+	if !dryRun {
+		batch = grocksdb.NewWriteBatch()
+		defer batch.Destroy()
+	}
 
 	prefix := storePrefix(storeName)
 	readOpts := grocksdb.NewDefaultReadOptions()
@@ -262,14 +267,14 @@ func (s Store) fixDataStore(storeName string, dryRun bool) error {
 		realKey := cloneAppend(prefix, pair.Key)
 
 		readOpts.SetTimestamp(pair.Timestamp)
-		oldValue, err := s.db.GetCF(readOpts, s.cfHandle, realKey)
+		oldValue, oldTimestamp, err := s.db.GetCFWithTS(readOpts, s.cfHandle, realKey)
 		if err != nil {
 			return err
 		}
 
-		clean := bytes.Equal(oldValue.Data(), pair.Value)
+		clean := bytes.Equal(oldValue.Data(), pair.Value) && bytes.Equal(oldTimestamp.Data(), pair.Timestamp)
 		oldValue.Free()
-
+		oldTimestamp.Free()
 		if clean {
 			continue
 		}