@@ -53,22 +53,29 @@ add_executable(test_display_utils test_display_utils.c)
5353add_executable (test_parser test_parser.c)
5454add_executable (test_script test_script.c)
5555add_executable (test_wallet test_wallet.c)
56+ add_executable (test_musig_zeroing test_musig_zeroing.c)
57+ add_executable (test_merkle_return_values test_merkle_return_values.c)
5658
5759# add_executable(test_crypto test_crypto.c)
5860
5961# Mock libraries
6062add_library (crypto_mocks SHARED libs/crypto_mocks.c)
6163add_library (sha256 SHARED libs/sha-256.c)
64+ add_library (musig_test_mocks SHARED libs/musig_test_mocks.c)
65+ add_library (merkle_test_mocks SHARED libs/merkle_test_mocks.c)
6266
6367# App's libraries
6468add_library (base58 SHARED $ENV{BOLOS_SDK} /lib_standard_app/base58.c)
6569add_library (bip32 SHARED $ENV{BOLOS_SDK} /lib_standard_app/bip32.c)
6670add_library (buffer SHARED $ENV{BOLOS_SDK} /lib_standard_app/buffer.c)
6771add_library (buffer_ext SHARED ../src/common/buffer_ext.c)
6872add_library (display_utils SHARED ../src/ui/display_utils.c)
73+ add_library (musig SHARED ../src/musig/musig.c)
6974add_library (parser SHARED ../src/common/parser_ext.c)
7075add_library (read SHARED $ENV{BOLOS_SDK} /lib_standard_app/read.c)
7176add_library (script SHARED ../src/common/script.c)
77+ add_library (secp256k1 SHARED ../src/secp256k1.c)
78+ add_library (get_merkleized_map_value SHARED ../src/handler/lib/get_merkleized_map_value.c)
7279add_library (varint SHARED $ENV{BOLOS_SDK} /lib_standard_app/varint.c)
7380add_library (wallet SHARED ../src/common/wallet.c)
7481add_library (write SHARED $ENV{BOLOS_SDK} /lib_standard_app/write.c)
@@ -78,13 +85,23 @@ add_library(write SHARED $ENV{BOLOS_SDK}/lib_standard_app/write.c)
7885# Mock libraries
7986target_link_libraries (crypto_mocks PUBLIC sha256)
8087
88+ # Musig library needs the mock crypto functions and secp256k1 constants
89+ target_link_libraries (musig PUBLIC musig_test_mocks secp256k1 write)
90+
8191# App's libraries
8292target_link_libraries (test_bitvector PUBLIC cmocka gcov)
8393target_link_libraries (test_buffer PUBLIC cmocka gcov buffer buffer_ext varint read write bip32)
8494target_link_libraries (test_display_utils PUBLIC cmocka gcov display_utils)
8595target_link_libraries (test_parser PUBLIC cmocka gcov parser buffer buffer_ext varint read write bip32)
8696target_link_libraries (test_script PUBLIC cmocka gcov script buffer varint read write bip32)
8797target_link_libraries (test_wallet PUBLIC cmocka gcov wallet script buffer buffer_ext varint read write bip32 base58 crypto_mocks)
98+ target_link_libraries (test_musig_zeroing PUBLIC cmocka gcov musig musig_test_mocks secp256k1)
99+
100+ # Merkle return value test: compile get_merkleized_map_value.c against mock sub-functions
101+ target_include_directories (get_merkleized_map_value PRIVATE ../src/common ../src/handler/lib)
102+ target_include_directories (test_merkle_return_values PRIVATE ../src/common ../src/handler/lib)
103+ target_link_libraries (get_merkleized_map_value PUBLIC merkle_test_mocks read)
104+ target_link_libraries (test_merkle_return_values PUBLIC cmocka gcov get_merkleized_map_value merkle_test_mocks read)
88105
89106# target_link_libraries(test_crypto PUBLIC cmocka gcov crypto)
90107add_test (test_bitvector test_bitvector)
@@ -93,5 +110,7 @@ add_test(test_display_utils test_display_utils)
93110add_test (test_parser test_parser)
94111add_test (test_script test_script)
95112add_test (test_wallet test_wallet)
113+ add_test (test_musig_zeroing test_musig_zeroing)
114+ add_test (test_merkle_return_values test_merkle_return_values)
96115
97116# add_test(test_crypto test_crypto)
0 commit comments