diff --git a/src/fcmp/fcmp.h b/src/fcmp/fcmp.h index f56a013e7..4d678077d 100644 --- a/src/fcmp/fcmp.h +++ b/src/fcmp/fcmp.h @@ -162,7 +162,7 @@ namespace fcmp { // Starting index in the leaf layer std::size_t start_idx; - // Contiguous leaves in a tree that start at the start_idx + // Contiguous leaves in a tree that start at the start_idx std::vector tuples; }; @@ -179,7 +179,7 @@ namespace fcmp struct TreeExtension final { Leaves leaves; - std::vector> c1_layer_extensions; + std::vector> c1_layer_extensions; std::vector> c2_layer_extensions; }; @@ -313,7 +313,7 @@ namespace fcmp bool parent_is_c1 = true; // Since we started with c2, the number of c2 layers should be == c1_layers.size() || (c1_layers.size() + 1) - const std::size_t num_layers = c2_layers.size(); + const std::size_t num_layers = c2_layers.size(); CHECK_AND_ASSERT_THROW_MES(num_layers == c1_layers.size() || num_layers == (c1_layers.size() + 1), "unexpected number of curve layers"); @@ -405,7 +405,7 @@ namespace fcmp // There won't be any existing children when growing the leaf layer, fill priors with 0 std::vector prior_children; - extend_zeroes(curve, new_children.size(), prior_children); + extend_zeroes(curve, new_children.size(), prior_children); return curve.hash_grow( curve.GENERATORS, @@ -764,7 +764,7 @@ namespace fcmp if (tree_inout.c2_layers.size() == c2_idx) tree_inout.c2_layers.emplace_back(Layer{}); - auto &c2_inout = tree_inout.c2_layers[c2_idx]; + auto &c2_inout = tree_inout.c2_layers[c2_idx]; const bool started_after_tip = (c2_inout.size() == c2_ext.start_idx); const bool started_at_tip = (c2_inout.size() == (c2_ext.start_idx + 1)); @@ -790,7 +790,7 @@ namespace fcmp if (tree_inout.c1_layers.size() == c1_idx) tree_inout.c1_layers.emplace_back(Layer{}); - auto &c1_inout = tree_inout.c1_layers[c1_idx]; + auto &c1_inout = tree_inout.c1_layers[c1_idx]; const bool started_after_tip = (c1_inout.size() == c1_ext.start_idx); const bool started_at_tip = (c1_inout.size() == (c1_ext.start_idx + 1)); diff --git a/tests/unit_tests/fcmp_tree.cpp b/tests/unit_tests/fcmp_tree.cpp index 2d4ddbe1c..22809e1a9 100644 --- a/tests/unit_tests/fcmp_tree.cpp +++ b/tests/unit_tests/fcmp_tree.cpp @@ -84,7 +84,7 @@ static void log_tree_extension(const fcmp::TreeExtension &c2_layer = c2_extensions[c2_idx]; + const fcmp::LayerExtension &c2_layer = c2_extensions[c2_idx]; MDEBUG("Selene tree extension start idx: " << c2_layer.start_idx); for (std::size_t j = 0; j < c2_layer.hashes.size(); ++j) @@ -96,7 +96,7 @@ static void log_tree_extension(const fcmp::TreeExtension &c1_layer = c1_extensions[c1_idx]; + const fcmp::LayerExtension &c1_layer = c1_extensions[c1_idx]; MDEBUG("Helios tree extension start idx: " << c1_layer.start_idx); for (std::size_t j = 0; j < c1_layer.hashes.size(); ++j) @@ -134,7 +134,7 @@ static void log_tree(const fcmp::Tree &tree) { CHECK_AND_ASSERT_THROW_MES(c2_idx < tree.c2_layers.size(), "unexpected c2 layer"); - const fcmp::Layer &c2_layer = tree.c2_layers[c2_idx]; + const fcmp::Layer &c2_layer = tree.c2_layers[c2_idx]; MDEBUG("Selene layer size: " << c2_layer.size() << " , tree layer: " << i); for (std::size_t j = 0; j < c2_layer.size(); ++j) @@ -146,7 +146,7 @@ static void log_tree(const fcmp::Tree &tree) { CHECK_AND_ASSERT_THROW_MES(c1_idx < tree.c1_layers.size(), "unexpected c1 layer"); - const fcmp::Layer &c1_layer = tree.c1_layers[c1_idx]; + const fcmp::Layer &c1_layer = tree.c1_layers[c1_idx]; MDEBUG("Helios layer size: " << c1_layer.size() << " , tree layer: " << i); for (std::size_t j = 0; j < c1_layer.size(); ++j) @@ -248,7 +248,7 @@ TEST(fcmp_tree, grow_tree) fcmp::extend_tree( tree_extension, fcmp::HELIOS, - fcmp::SELENE, + fcmp::SELENE, global_tree); log_tree(global_tree); @@ -285,7 +285,7 @@ TEST(fcmp_tree, grow_tree) fcmp::extend_tree( tree_extension, fcmp::HELIOS, - fcmp::SELENE, + fcmp::SELENE, global_tree); log_tree(global_tree);