Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

actual indexing fix, tests now passing

This commit is contained in:
j-berman 2024-05-17 18:51:18 -07:00
parent 33ad50b176
commit c05bd80ee5
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/fcmp/fcmp.h
View File

@ -298,24 +298,28 @@ namespace fcmp
const auto &c1_layers = tree.c1_layers; const auto &c1_layers = tree.c1_layers;
const auto &c2_layers = tree.c2_layers; const auto &c2_layers = tree.c2_layers;
// We started with c2 and then alternated, so c2 is the same size or 1 higher than c1
CHECK_AND_ASSERT_THROW_MES(c2_layers.size() == c1_layers.size() || c2_layers.size() == (c1_layers.size() + 1),
"unexpected number of curve layers");
LastChunks<C1, C2> last_chunks; LastChunks<C1, C2> last_chunks;
last_chunks.c1_last_chunks.reserve(c1_layers.size());
last_chunks.c2_last_chunks.reserve(c2_layers.size()); auto &c1_last_chunks_out = last_chunks.c1_last_chunks;
auto &c2_last_chunks_out = last_chunks.c2_last_chunks;
c1_last_chunks_out.reserve(c1_layers.size());
c2_last_chunks_out.reserve(c2_layers.size());
// First push the last leaf chunk data into c2 chunks // First push the last leaf chunk data into c2 chunks
CHECK_AND_ASSERT_THROW_MES(!c2_layers.empty(), "empty curve 2 layers"); CHECK_AND_ASSERT_THROW_MES(!c2_layers.empty(), "empty curve 2 layers");
auto last_leaf_chunk = get_last_leaf_chunk<C2>(c2, auto last_leaf_chunk = get_last_leaf_chunk<C2>(c2,
leaves, leaves,
c2_layers[0]); c2_layers[0]);
last_chunks.c2_last_chunks.push_back(std::move(last_leaf_chunk)); c2_last_chunks_out.push_back(std::move(last_leaf_chunk));
// Next parents will be c1 // Next parents will be c1
bool parent_is_c1 = true; bool parent_is_c1 = true;
// We started with c2 and then alternated, so c2 is the same size or 1 higher than c1
CHECK_AND_ASSERT_THROW_MES(c2_layers.size() == c1_layers.size() || c2_layers.size() == (c1_layers.size() + 1),
"unexpected number of curve layers");
// If there are no c1 layers, we're done // If there are no c1 layers, we're done
if (c1_layers.empty()) if (c1_layers.empty())
return last_chunks; return last_chunks;
@ -323,7 +327,7 @@ namespace fcmp
// Then get last chunks up until the root // Then get last chunks up until the root
std::size_t c1_idx = 0; std::size_t c1_idx = 0;
std::size_t c2_idx = 0; std::size_t c2_idx = 0;
for (std::size_t i = 0; i < c2_layers.size(); ++i) while (c1_last_chunks_out.size() < c1_layers.size() || c2_last_chunks_out.size() < c2_layers.size())
{ {
CHECK_AND_ASSERT_THROW_MES(c1_layers.size() > c1_idx, "missing c1 layer"); CHECK_AND_ASSERT_THROW_MES(c1_layers.size() > c1_idx, "missing c1 layer");
CHECK_AND_ASSERT_THROW_MES(c2_layers.size() > c2_idx, "missing c2 layer"); CHECK_AND_ASSERT_THROW_MES(c2_layers.size() > c2_idx, "missing c2 layer");
@ -342,7 +346,7 @@ namespace fcmp
child_layer, child_layer,
parent_layer); parent_layer);
last_chunks.c1_last_chunks.push_back(std::move(last_parent_chunk)); c1_last_chunks_out.push_back(std::move(last_parent_chunk));
++c2_idx; ++c2_idx;
} }
@ -359,7 +363,7 @@ namespace fcmp
child_layer, child_layer,
parent_layer); parent_layer);
last_chunks.c2_last_chunks.push_back(std::move(last_parent_chunk)); c2_last_chunks_out.push_back(std::move(last_parent_chunk));
++c1_idx; ++c1_idx;
} }
@ -368,6 +372,9 @@ namespace fcmp
parent_is_c1 = !parent_is_c1; parent_is_c1 = !parent_is_c1;
} }
CHECK_AND_ASSERT_THROW_MES(c1_last_chunks_out.size() == c1_layers.size(), "unexepcted c1 last chunks");
CHECK_AND_ASSERT_THROW_MES(c2_last_chunks_out.size() == c2_layers.size(), "unexepcted c2 last chunks");
return last_chunks; return last_chunks;
} }
@ -515,7 +522,6 @@ namespace fcmp
std::vector<typename C_PARENT::Scalar> child_scalars; std::vector<typename C_PARENT::Scalar> child_scalars;
if (last_child_chunk_ptr != nullptr && last_child_chunk_ptr->parent_layer_size == 1) if (last_child_chunk_ptr != nullptr && last_child_chunk_ptr->parent_layer_size == 1)
{ {
// We should be updating the existing root, there shouldn't be a last parent chunk // We should be updating the existing root, there shouldn't be a last parent chunk
CHECK_AND_ASSERT_THROW_MES(last_parent_chunk_ptr == nullptr, "last parent chunk exists at root"); CHECK_AND_ASSERT_THROW_MES(last_parent_chunk_ptr == nullptr, "last parent chunk exists at root");