-#define shachain_index_t uint8_t
+#define SHACHAIN_BITS 8
#include <ccan/crypto/shachain/shachain.h>
/* Include the C files directly. */
{
struct sha256 seed;
struct shachain chain;
- struct sha256 expect[NUM_TESTS];
- size_t i, j;
+ struct sha256 expect[NUM_TESTS+1];
+ int i, j;
/* This is how many tests you plan to run */
- plan_tests(NUM_TESTS + NUM_TESTS * (NUM_TESTS + 1) + NUM_TESTS);
+ plan_tests(66559);
memset(&seed, 0, sizeof(seed));
- /* Generate a whole heap. */
- for (i = 0; i < NUM_TESTS; i++) {
+ /* Generate a whole heap; each should be different */
+ for (i = 0; i <= NUM_TESTS; i++) {
shachain_from_seed(&seed, i, &expect[i]);
if (i == 0)
- ok1(memcmp(&expect[i], &seed, sizeof(expect[i])));
+ ok1(memcmp(&expect[i], &seed, sizeof(expect[i])) == 0);
else
ok1(memcmp(&expect[i], &expect[i-1], sizeof(expect[i])));
}
shachain_init(&chain);
- for (i = 0; i < NUM_TESTS; i++) {
+ for (i = NUM_TESTS; i > 0; i--) {
struct sha256 hash;
- shachain_add_hash(&chain, i, &expect[i]);
- for (j = 0; j <= i; j++) {
+ ok1(shachain_add_hash(&chain, i, &expect[i]));
+ for (j = i; j <= NUM_TESTS; j++) {
ok1(shachain_get_hash(&chain, j, &hash));
ok1(memcmp(&hash, &expect[j], sizeof(hash)) == 0);
}
- ok1(!shachain_get_hash(&chain, i+1, &hash));
- if (chain.num_valid == 8) {
- printf("%zu: num_valid %u\n", i, chain.num_valid);
- for (j = 0; j < 8; j++)
- printf("chain.known[%zu] = 0x%02x\n",
- j, chain.known[j].index);
- }
+ ok1(!shachain_get_hash(&chain, i-1, &hash));
+ }
+
+ /* Now add seed. */
+ ok1(shachain_add_hash(&chain, 0, &expect[0]));
+ for (j = 0; j <= NUM_TESTS; j++) {
+ struct sha256 hash;
+ ok1(shachain_get_hash(&chain, j, &hash));
+ ok1(memcmp(&hash, &expect[j], sizeof(hash)) == 0);
}
return exit_status();