Merge branch 'murisi/mock-masp-prover' (#2695)

* murisi/mock-masp-prover:
  masp: move the mock stuff under testing sub-mod
  Added changelog entry.
  Do not allow MASP_TEST_SEED to be used outside of testing.
  Implemented a MockSaplingVerificationContext and enable it for testing flag.
  Modified the transaction generator to use mock prover when in testing mode.

.changelog/unreleased/testing/2695-mock-masp-prover.md

@@ -0,0 +1,2 @@
+- Implemented mock transaction prover and verifier for faster testing and lower
+  development time. ([\#2695](https://github.com/anoma/namada/pull/2695))

Cargo.toml

@@ -115,8 +115,8 @@ ledger-transport-hid = "0.10.0"
 libc = "0.2.97"
 libloading = "0.7.2"
 # branch = "murisi/namada-integration"
-masp_primitives = { git = "https://github.com/anoma/masp", tag = "v1.1.0" }
-masp_proofs = { git = "https://github.com/anoma/masp", tag = "v1.1.0", default-features = false, features = ["local-prover"] }
+masp_primitives = { git = "https://github.com/anoma/masp", rev = "30492323d98b0531fd18b6285cd94afcaa4066d2" }
+masp_proofs = { git = "https://github.com/anoma/masp", rev = "30492323d98b0531fd18b6285cd94afcaa4066d2", default-features = false, features = ["local-prover"] }
 num256 = "0.3.5"
 num_cpus = "1.13.0"
 num-derive = "0.3.3"

Makefile

@@ -4,7 +4,6 @@ package = namada
 NAMADA_E2E_USE_PREBUILT_BINARIES ?= true
 NAMADA_E2E_DEBUG ?= true
 RUST_BACKTRACE ?= 1
-NAMADA_MASP_TEST_SEED ?= 0
 PROPTEST_CASES ?= 100
 # Disable shrinking in `make test-pos-sm` for CI runs. If the test fail in CI,
 # we only want to get the seed.
@@ -149,14 +148,12 @@ test: test-unit test-e2e test-wasm test-benches
 
 test-coverage:
 	# Run integration tests separately because they require `integration`
-	# feature (and without coverage) and run them with pre-built MASP proofs
+	# feature (and without coverage)
 	$(cargo) +$(nightly) llvm-cov --output-path lcov.info \
 		--features namada/testing \
 		--lcov \
 		-- --skip e2e --skip pos_state_machine_test --skip integration \
 		-Z unstable-options --report-time && \
-	NAMADA_MASP_TEST_SEED=$(NAMADA_MASP_TEST_SEED) \
-	NAMADA_MASP_TEST_PROOFS=load \
 	$(cargo) +$(nightly) test integration:: \
 		--features integration \
 		-- -Z unstable-options --report-time
@@ -176,23 +173,8 @@ test-e2e:
 	--nocapture \
 	-Z unstable-options --report-time
 
-# Run integration tests with pre-built MASP proofs
+# Run integration tests
 test-integration:
-	NAMADA_MASP_TEST_SEED=$(NAMADA_MASP_TEST_SEED) \
-	NAMADA_MASP_TEST_PROOFS=load \
-	make test-integration-slow
-
-# Clear pre-built proofs, run integration tests and save the new proofs
-test-integration-save-proofs:
-    # Clear old proofs first
-	rm -f test_fixtures/masp_proofs/*.bin || true
-	NAMADA_MASP_TEST_SEED=$(NAMADA_MASP_TEST_SEED) \
-	NAMADA_MASP_TEST_PROOFS=save \
-	TEST_FILTER=masp \
-	make test-integration-slow
-
-# Run integration tests without specifying any pre-built MASP proofs option
-test-integration-slow:
 	RUST_BACKTRACE=$(RUST_BACKTRACE) \
 	$(cargo) +$(nightly) test $(jobs) integration::$(TEST_FILTER)  --features integration \
 	-Z unstable-options \