Fixed bip39 dictionary word lookup botch.

Author: ksedgwic

TODO.md

@@ -1,4 +1,4 @@
-* Maybe update bc-crypto-base version.
+* Whitespace cleanup in userinterface.ino, also "1 2 3 4"
 
 * Remove the ESP32 code from lethe.ino?
 

seedtool/selftest.ino

@@ -199,10 +199,16 @@ bool test_bip39_generate() {
     Seed * seed = Seed::from_rolls("123456");
     BIP39Seq * bip39 = new BIP39Seq(seed);
     for (size_t ii = 0; ii < BIP39Seq::WORD_COUNT; ++ii) {
-        if (bip39->get_word(ii) != ref_bip39_words_correct[ii])
+        uint16_t word = bip39->get_word(ii);
+        if (word != ref_bip39_words_correct[ii])
             return test_failed("test_bip39_generate failed: word mismatch\n");
+        if (strcmp(BIP39Seq::get_dict_string(word).c_str(),
+                   ref_bip39_mnemonics[ii]) != 0)
+            return test_failed("test_bip39_generate failed: "
+                               "dict_string mismatch\n");
         if (strcmp(bip39->get_string(ii).c_str(), ref_bip39_mnemonics[ii]) != 0)
-            return test_failed("test_bip39_generate failed: mnemonic mismatch\n");
+            return test_failed("test_bip39_generate failed: "
+                               "mnemonic mismatch\n");
     }
     delete bip39;
     delete seed;

seedtool/userinterface.ino

@@ -786,7 +786,7 @@ struct WordListState {
         free(wordndx);
     }
 
-    virtual char const * refword(int ndx) = 0;
+    virtual String refword(int ndx) = 0;
 
     void set_words(uint16_t const * wordlist) {
         for (int ii = 0; ii < nwords; ++ii)
@@ -829,7 +829,7 @@ struct WordListState {
     }
 
     void cursor_right() {
-        if (pos < (int)strlen(refword(wordndx[selected])) - 1)
+        if (pos < (int)refword(wordndx[selected]).length() - 1)
             ++pos;
     }
 
@@ -868,7 +868,7 @@ struct WordListState {
     }
 
     String prefix(int word) {
-        return String(refword(word)).substring(0, pos);
+        return refword(word).substring(0, pos);
     }
 
     char current(int word) {
@@ -890,8 +890,8 @@ struct WordListState {
 
 struct SLIP39WordlistState : WordListState {
     SLIP39WordlistState(int i_nwords) : WordListState(i_nwords, 1024) {}
-    virtual char const * refword(int ndx) {
-        return slip39_string_for_word(ndx);
+    virtual String refword(int ndx) {
+        return String(slip39_string_for_word(ndx));
     }
 };
 
@@ -901,8 +901,8 @@ struct BIP39WordlistState : WordListState {
         : WordListState(i_nwords, 2048)
         , bip39(i_bip39)
     {}
-    virtual char const * refword(int ndx) {
-        return BIP39Seq::get_dict_string(ndx).c_str();
+    virtual String refword(int ndx) {
+        return BIP39Seq::get_dict_string(ndx);
     }
 };
 
@@ -935,7 +935,7 @@ void restore_bip39() {
 
             for (int rr = 0; rr < state.nrows; ++rr) {
                 int wndx = state.scroll + rr;
-                String word = String(state.refword(state.wordndx[wndx]));
+                String word = state.refword(state.wordndx[wndx]);
                 Serial.println(String(wndx) + " " + word);
 
                 if (wndx != state.selected) {
@@ -1256,7 +1256,7 @@ void enter_share() {
 
             for (int rr = 0; rr < state.nrows; ++rr) {
                 int wndx = state.scroll + rr;
-                String word = String(state.refword(state.wordndx[wndx]));
+                String word = state.refword(state.wordndx[wndx]);
                 Serial.println(String(wndx) + " " + word);
 
                 if (wndx != state.selected) {