@@ -192,7 +192,6 @@ public:

     std::vector<uint8_t> decode (std::string input) const override

     {

-        //TODO: where to pad input to required size?

         auto lookup_table = construct_lookup_table();

         auto input_size = calculate_decoded_size (input);

@@ -201,6 +200,7 @@ public:

         unsigned long long bits_written = 0;

         for (std::string::size_type idx = 0; idx < input.size(); idx++) {

+            // TODO: fail on invalid input

             uint8_t val = lookup_table[input[idx]];

             uint8_t start_bit = bits_written % 8;

@@ -43,7 +43,6 @@ dual_control initialize()

     fstreams fstreams (fstreams::create());

     sys_time time (sys_time::get());

     int code_digits = 6;

-    //TODO: have generator take the key after construction

     totp_generator generator = totp_generator (time, code_digits);

     tokens tokens (tokens::create (fstreams, generator));

     validator validator (validator::create (directory, tokens));

@@ -173,8 +173,7 @@ int int_precomputed()

     // then

     check (actual.size() == 6, "size is wrong");

-    check (actual == expected,

-           "precomputed value failed to match"); // TODO: Does == work for std::string like I want it to?

+    check (actual == expected, "precomputed value failed to match");

     succeed();

 }

@@ -47,11 +47,11 @@ public:

         user user (found_user[0]);

         std::string key_string = tokens_.ensure_key (user);

+        // TODO: use vectors in generator input instead of strings to avoid this nonsense

         std::vector<uint8_t> key = base32().decode (key_string);

         std::string decoded_key (key.begin(), key.end());

         std::string token = generator_.generate_token (decoded_key);

-        // TODO: fix generator input

         return {key_string, token};

     }

 };

@@ -21,6 +21,7 @@

 #include "test_util.h"

 #include "generator.h"

+// TODO: audit usage of 'token', sometimes it should be 'key'

 class mock_tokens : public tokens_ifc

 {

 public:

@@ -190,9 +191,6 @@ int unistd_does_not_find_user_name_empty_string_case()

     std::tie (actual_key, actual_token) = installer.install_key();

     //then

-    // TODO: rethink this...

-    check (test_tokens->captured_token == "",

-           "should not have installed a token");

     check (actual_key == "",

            "should not have installed a token");

     check (actual_token == "",

@@ -31,7 +31,8 @@ private:

     totp_generator generator_;

     random_source rand_;

 public:

-    tokens_impl (const fstreams &fstreams, const totp_generator generator, const random_source rand) :

+    tokens_impl (const fstreams &fstreams, const totp_generator generator,

+                 const random_source rand) :

         fstreams_ (fstreams), generator_ (generator), rand_ (rand) {}

     std::string token (const user &user) const override

     {

@@ -67,7 +68,6 @@ private:

         std::string file_path = get_key_path (user);

         fstreams::pstream stream (fstreams_.open_fstream (file_path));

-        // TODO: ignore newlines

         std::vector<char> line_v (16);

         stream->read (line_v.data(), line_v.size());

@@ -84,7 +84,7 @@ public:

         base32 codec;

         // get randomness

         int length = 10;

-        std::vector<uint8_t> random_bytes (rand_.get_random_bytes(length));

+        std::vector<uint8_t> random_bytes (rand_.get_random_bytes (length));

         // base32encode it

         std::string key = codec.encode (random_bytes);

         return key;

@@ -118,3 +118,4 @@ tokens tokens::create (const fstreams &fstreams,

     return tokens (tokens::delegate

                    (new tokens_impl (fstreams, generator, rand)));

 }

+