add missing DEVEL sections

vacuumlabs · Oct 28, 2020 · 60062ef · 60062ef
1 parent f3f3707
commit 60062ef
Show file tree

Hide file tree

Showing 17 changed files with 46 additions and 26 deletions.
diff --git a/src/addressUtilsByron.h b/src/addressUtilsByron.h
@@ -32,6 +32,9 @@ uint32_t extractProtocolMagic(
         const uint8_t* addressBuffer, size_t addressSize
 );
 
-void run_addressUtilsByron_test();
 
+#ifdef DEVEL
+void run_addressUtilsByron_test();
 #endif
+
+#endif // H_CARDANO_APP_ADDRESS_UTILS_BYRON
diff --git a/src/addressUtilsByron_test.c b/src/addressUtilsByron_test.c
@@ -5,33 +5,22 @@
 #include "hexUtils.h"
 #include "test_utils.h"
 
-// Note(ppershing): Used in macros to have (parenthesis) => {initializer} magic
-#define UNWRAP(...) __VA_ARGS__
-
 #define HD HARDENED_BIP32
 
-static void pathSpec_init(bip44_path_t* pathSpec, uint32_t* pathArray, uint32_t pathLength)
+static void pathSpec_init(bip44_path_t* pathSpec, const uint32_t* pathArray, uint32_t pathLength)
 {
 	pathSpec->length = pathLength;
 	os_memmove(pathSpec->path, pathArray, pathLength * 4);
 }
 
-static void PRINTF_bip44(const bip44_path_t* pathSpec)
-{
-	char tmp[100];
-	SIZEOF(*pathSpec);
-	bip44_printToStr(pathSpec, tmp, SIZEOF(tmp));
-	PRINTF("%s", tmp);
-};
-
 void testcase_deriveAddress_byron(uint32_t* path, uint32_t pathLen, uint32_t protocolMagic, const char* expectedHex)
 {
 	PRINTF("testcase_deriveAddressByron ");
 
 	bip44_path_t pathSpec;
 	pathSpec_init(&pathSpec, path, pathLen);
 
-	PRINTF_bip44(&pathSpec);
+	bip44_PRINTF(&pathSpec);
 	PRINTF("\n");
 
 	uint8_t address[128];

diff --git a/src/addressUtilsShelley.h b/src/addressUtilsShelley.h
@@ -78,6 +78,9 @@ size_t humanReadableAddress(const uint8_t* address, size_t addressSize, char* ou
 
 void parseAddressParams(const uint8_t *wireDataBuffer, size_t wireDataSize, addressParams_t* params);
 
-void run_addressUtilsShelley_test();
 
+#ifdef DEVEL
+void run_addressUtilsShelley_test();
 #endif
+
+#endif // H_CARDANO_APP_ADDRESS_UTILS_SHELLEY
diff --git a/src/addressUtilsShelley_test.c b/src/addressUtilsShelley_test.c
@@ -6,9 +6,6 @@
 #include "hexUtils.h"
 #include "test_utils.h"
 
-// Note(ppershing): Used in macros to have (parenthesis) => {initializer} magic
-#define UNWRAP(...) __VA_ARGS__
-
 #define HD HARDENED_BIP32
 #define MAX_ADDRESS_LENGTH 128
 

diff --git a/src/base58.h b/src/base58.h
@@ -9,6 +9,9 @@ size_t base58_encode(
         char *outStr, size_t outMaxSize
 );
 
+
+#ifdef DEVEL
 void run_base58_test();
+#endif
 
 #endif
diff --git a/src/bech32.h b/src/bech32.h
@@ -15,6 +15,9 @@
  */
 size_t bech32_encode(const char *hrp, const uint8_t *bytes, size_t bytesSize, char *output, size_t maxOutputSize);
 
+
+#ifdef DEVEL
 void run_bech32_test();
+#endif
 
 #endif /* H_CARDANO_APP_BECH32 */
diff --git a/src/cbor.h b/src/cbor.h
@@ -55,5 +55,9 @@ size_t cbor_writeToken(uint8_t type, uint64_t value, uint8_t* buffer, size_t buf
 
 cbor_token_t cbor_parseToken(const uint8_t* buf, size_t size);
 
+
+#ifdef DEVEL
 void run_cbor_test();
 #endif
+
+#endif // H_CARDANO_APP_CBOR
diff --git a/src/crc32.h b/src/crc32.h
@@ -5,5 +5,9 @@
 
 uint32_t crc32(const uint8_t* inBuffer, size_t inSize);
 
+
+#ifdef DEVEL
 void run_crc32_test();
 #endif
+
+#endif
diff --git a/src/endian.h b/src/endian.h
@@ -54,6 +54,9 @@ inline uint64_t u8be_read(const uint8_t* inBuffer)
 	return ((uint64_t) u4be_read(inBuffer) << 32u) | (uint64_t) (u4be_read(inBuffer + 4));
 }
 
+
+#ifdef DEVEL
 void run_endian_test();
+#endif
 
 #endif // H_CARDANO_APP_ENDIAN
diff --git a/src/hash.h b/src/hash.h
@@ -89,5 +89,8 @@ __CIPHER_DECLARE(BLAKE2B, blake2b, 512)
 __CIPHER_DECLARE(SHA3, sha3, 256)
 
 
+#ifdef DEVEL
 void run_hash_test();
 #endif
+
+#endif // H_CARDANO_APP_BLAKE2B
diff --git a/src/hash_test.c b/src/hash_test.c
@@ -46,7 +46,6 @@ void testcase_blake2b_224(const char* inputHex, const char* expectedHex)
 
 void run_blake2b_test()
 {
-#define UNWRAP(...) __VA_ARGS__
 #define TESTCASE_CHUNKS_BLAKE2B_512(chunks_, expected_) \
 	{ \
 		const char* chunks[] = { UNWRAP chunks_ }; \

diff --git a/src/hexUtils.h b/src/hexUtils.h
@@ -11,5 +11,9 @@ size_t decode_hex(const char* inStr, uint8_t* outBuffer, size_t outMaxSize);
 
 size_t encode_hex(const uint8_t* bytes, size_t bytesLength, char* outString, size_t outMaxSize);
 
+
+#ifdef DEVEL
 void run_hex_test();
 #endif
+
+#endif
diff --git a/src/keyDerivation.h b/src/keyDerivation.h
@@ -44,5 +44,8 @@ void extractRawPublicKey(
 );
 
 
+#ifdef DEVEL
 void run_key_derivation_test();
 #endif
+
+#endif // H_CARDANO_APP_KEY_DERIVATION
diff --git a/src/keyDerivation_test.c b/src/keyDerivation_test.c
@@ -4,10 +4,7 @@
 #include "hexUtils.h"
 #include "test_utils.h"
 
-// Note(ppershing): Used in macros to have (parenthesis) => {initializer} magic
-#define UNWRAP(...) __VA_ARGS__
-
-static void pathSpec_init(bip44_path_t* pathSpec, uint32_t* pathArray, uint32_t pathLength)
+static void pathSpec_init(bip44_path_t* pathSpec, const uint32_t* pathArray, uint32_t pathLength)
 {
 	pathSpec->length = pathLength;
 	os_memmove(pathSpec->path, pathArray, pathLength * 4);

diff --git a/src/test_utils.h b/src/test_utils.h
@@ -60,5 +60,7 @@
 	} END_TRY; \
 	}
 
+// Note(ppershing): Used in macros to have (parenthesis) => {initializer} magic
+#define UNWRAP(...) __VA_ARGS__
 
 #endif
diff --git a/src/textUtils.h b/src/textUtils.h
@@ -21,12 +21,12 @@ size_t str_formatMetadata(const uint8_t* metadataHash, size_t metadataHashSize,
 
 void str_validateText(const uint8_t* url, size_t urlSize);
 
+
 #ifdef DEVEL
 // only used in tests
 size_t urlToBuffer(const char* url, uint8_t* buffer, size_t bufferSize);
 size_t dnsNameToBuffer(const char* dnsName, uint8_t* buffer, size_t bufferSize);
-#endif
-
 void run_textUtils_test();
-
 #endif
+
+#endif // H_CARDANO_APP_TEXT_UTILS
diff --git a/src/txHashBuilder.h b/src/txHashBuilder.h
@@ -151,6 +151,9 @@ void txHashBuilder_finalize(
         uint8_t* outBuffer, size_t outSize
 );
 
+
+#ifdef DEVEL
 void run_txHashBuilder_test();
+#endif
 
 #endif // H_CARDANO_APP_TX_HASH_BUILDER