test: fix ci failures

Author: siv2r

Makefile.am

@@ -209,7 +209,7 @@ TESTS += musig_example
 if ENABLE_MODULE_BATCH
 noinst_PROGRAMS += batch_example
 batch_example_SOURCES = examples/batch.c
-batch_example_CPPFLAGS = -I$(top_srcdir)/include
+batch_example_CPPFLAGS = -I$(top_srcdir)/include -DSECP256K1_STATIC
 batch_example_LDADD = libsecp256k1.la
 batch_example_LDFLAGS = -static
 if BUILD_WINDOWS

ci/ci.sh

@@ -80,7 +80,7 @@ esac
     --enable-module-extrakeys="$EXTRAKEYS" \
     --enable-module-schnorrsig="$SCHNORRSIG" \
     --enable-module-musig="$MUSIG" \
-    --enable-module-batch="$BATCH"
+    --enable-module-batch="$BATCH" \
     --enable-examples="$EXAMPLES" \
     --enable-ctime-tests="$CTIMETESTS" \
     --with-valgrind="$WITH_VALGRIND" \

src/modules/batch/main_impl.h

@@ -59,7 +59,7 @@ static size_t secp256k1_batch_scratch_size(int max_terms) {
 
 /** Clears the scalar and points allocated on the batch object's scratch space */
 static void secp256k1_batch_scratch_clear(secp256k1_batch* batch) {
-    secp256k1_scalar_clear(&batch->sc_g);
+    secp256k1_scalar_set_int(&batch->sc_g, 0);
     /* setting the len = 0 will suffice (instead of clearing the memory)
      * since, there are no secrets stored on the scratch space */
     batch->len = 0;
@@ -134,7 +134,7 @@ secp256k1_batch* secp256k1_batch_create(const secp256k1_context* ctx, size_t max
         }
 
         /* set remaining data members */
-        secp256k1_scalar_clear(&batch->sc_g);
+        secp256k1_scalar_set_int(&batch->sc_g, 0);
         secp256k1_batch_sha256_tagged(&batch->sha256);
         if (aux_rand16 != NULL) {
             secp256k1_sha256_write(&batch->sha256, aux_rand16, 16);

src/modules/extrakeys/Makefile.am.include

@@ -4,6 +4,7 @@ include_HEADERS += include/secp256k1_tweak_check_batch.h
 endif
 noinst_HEADERS += src/modules/extrakeys/tests_impl.h
 noinst_HEADERS += src/modules/extrakeys/tests_exhaustive_impl.h
+noinst_HEADERS += src/modules/extrakeys/bench_impl.h
 noinst_HEADERS += src/modules/extrakeys/main_impl.h
 if ENABLE_MODULE_BATCH
 noinst_HEADERS += src/modules/extrakeys/batch_add_impl.h