shachain: remove unnecessary shachain_index_t

[ccan] / ccan / crypto / shachain / shachain.h

diff --git a/ccan/crypto/shachain/shachain.h b/ccan/crypto/shachain/shachain.h
index 4a3051e69e29ae1a1723877c3fca2dd2557aab1a..d95b97363f7d8e0bb243b6ebba9f35c8db3b5364 100644 (file)
--- a/ccan/crypto/shachain/shachain.h
+++ b/ccan/crypto/shachain/shachain.h
@@ -6,57 +6,56 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-/* Useful for testing. */
-#ifndef shachain_index_t
-#define shachain_index_t uint64_t
+#ifndef SHACHAIN_BITS
+#define SHACHAIN_BITS (sizeof(uint64_t) * 8)
 #endif
 
 /**
  * shachain_from_seed - Generate an unpredictable SHA from a seed value.
  * @seed: (secret) seed value to use
- * @index: index of value to generate.
+ * @index: index of value to generate (0 == seed)
  * @hash: value generated
  *
  * There will be no way to derive the result from that generated for
- * any *lesser* index.
+ * any *greater* index.
  *
  * Example:
  * #include <time.h>
  *
  * static void next_hash(struct sha256 *hash)
  * {
- *     static uint64_t index = 0;
+ *     static uint64_t index = 0xFFFFFFFFFFFFFFFFULL;
  *     static struct sha256 seed;
  *
  *     // First time, initialize seed.
- *     if (index == 0) {
+ *     if (index == 0xFFFFFFFFFFFFFFFFULL) {
  *             // DO NOT DO THIS!  Very predictable!
  *             time_t now = time(NULL);
  *             memcpy(&seed, &now, sizeof(now));
  *     }
  *
- *     shachain_from_seed(&seed, index++, hash);
+ *     shachain_from_seed(&seed, index--, hash);
  * }
  */
-void shachain_from_seed(const struct sha256 *seed, shachain_index_t index,
+void shachain_from_seed(const struct sha256 *seed, uint64_t index,
                        struct sha256 *hash);
 
 /**
- * shachain - structure for recording/deriving incrementing chain members
- * @max_index: maximum index value successfully shachain_add_hash()ed.
- * @num_valid: number of known[] array valid.  If non-zero, @max_index valid.
- * @known: known values to allow us to derive those <= @max_index.
+ * shachain - structure for recording/deriving decrementing chain members
+ * @min_index: minimum index value successfully shachain_add_hash()ed.
+ * @num_valid: number of known[] array valid.  If non-zero, @min_index valid.
+ * @known: known values to allow us to derive those >= @min_index.
  *
  * This is sufficient storage to derive any shachain hash value previously
  * added.
  */
 struct shachain {
-       shachain_index_t max_index;
+       uint64_t min_index;
        unsigned int num_valid;
        struct {
-               shachain_index_t index;
+               uint64_t index;
                struct sha256 hash;
-       } known[sizeof(shachain_index_t) * 8];
+       } known[SHACHAIN_BITS + 1];
 };
 
 /**
@@ -67,33 +66,42 @@ struct shachain {
  */
 void shachain_init(struct shachain *chain);
 
+/**
+ * shachain_next_index - what's the next index I can add to the shachain?
+ * @chain: the chain
+ *
+ * This returns 0xFFFFFFFFFFFFFFFF (for a freshly
+ * initialized chain), or one less than the previously successfully
+ * added value.
+ */
+uint64_t shachain_next_index(const struct shachain *chain);
+
 /**
  * shachain_add_hash - record the hash for the next index.
  * @chain: the chain to add to
  * @index: the index of the hash
  * @hash: the hash value.
  *
- * You can only add index 0 (for a freshly initialized chain), or one more
- * than the previously successfully added value.
+ * You can only add shachain_next_index(@chain).
  *
  * This can fail (return false without altering @chain) if the hash
  * for this index isn't consistent with previous hashes (ie. wasn't
  * generated from the same seed), though it can't always detect that.
- * If the hash is inconsistent yet undetected, the next addition will
+ * If the hash is inconsistent yet undetected, a future addition will
  * fail.
  *
  * Example:
  * static void next_hash(const struct sha256 *hash)
  * {
- *     static uint64_t index = 0;
+ *     static uint64_t index = 0xFFFFFFFFFFFFFFFFULL;
  *     static struct shachain chain;
  *
- *     if (!shachain_add_hash(&chain, index++, hash))
+ *     if (!shachain_add_hash(&chain, index--, hash))
  *             errx(1, "Corrupted hash value?");
  * }
  */
 bool shachain_add_hash(struct shachain *chain,
-                      shachain_index_t index, const struct sha256 *hash);
+                      uint64_t index, const struct sha256 *hash);
 
 /**
  * shachain_get_hash - get the hash for a given index.
@@ -111,18 +119,18 @@ bool shachain_add_hash(struct shachain *chain,
  *
  * static void next_hash(const struct sha256 *hash)
  * {
- *     static uint64_t index = 0;
+ *     static uint64_t index = 0xFFFFFFFFFFFFFFFFULL;
  *     static struct shachain chain;
  *
- *     if (!shachain_add_hash(&chain, index++, hash))
+ *     if (!shachain_add_hash(&chain, index--, hash))
  *             errx(1, "Corrupted hash value?");
  *     else {
  *             struct sha256 check;
- *             assert(shachain_get_hash(&chain, index-1, &check));
+ *             assert(shachain_get_hash(&chain, index+1, &check));
  *             assert(structeq(&check, hash));
  *     }
  * }
  */
 bool shachain_get_hash(const struct shachain *chain,
-                      shachain_index_t index, struct sha256 *hash);
+                      uint64_t index, struct sha256 *hash);
 #endif /* CCAN_CRYPTO_SHACHAIN_H */