Both algorithms are now batchable.

1 files changed, 9 insertions, 9 deletions

diff --git a/node/node_node.cpp b/node/node_node.cpp
index 0086bf7..f44a895 100644
--- a/node/node_node.cpp
+++ b/node/node_node.cpp
@@ -19,7 +19,7 @@ void fill_precomputation_pre_message(CMixContext& ctx, cmix_proto::PrePre& prepr
 	}
 	BOOST_LOG_TRIVIAL(trace) << ss.str();
 	
-	size_t len = get_group_element_array_size(&ctx);
+	size_t len = ctx.nr_mixes * get_group_element_array_size(&ctx);
 	std::vector<char*> r_ers(ms.size(), nullptr);
 	std::vector<char*> m_ers(ms.size(), nullptr);
 	std::vector<char const*> rsv(ms.size(), nullptr);
@@ -51,7 +51,7 @@ void fill_precomputation_pre_message(CMixContext& ctx, cmix_proto::PrePre& prepr
 
 template <typename T>
 void fill_precomputation_mix_message(CMixContext const& ctx, cmix_proto::PreMix& premix, T const& rs, T const& ms) {
-	size_t el_len = get_group_element_array_size(&ctx);
+	size_t el_len = ctx.nr_mixes * get_group_element_array_size(&ctx);
 	std::vector<char*> r_epirs(ms.size(), nullptr);
 	std::vector<char*> m_epirs(ms.size(), nullptr);
 	std::vector<char const*> rsv(ms.size(), nullptr);
@@ -127,7 +127,7 @@ void fill_commitments_message(CMixContext& ctx, cmix_proto::Commitments& commits
 
 template <typename T, typename U>
 void fill_realtime_pre_message(CMixContext& ctx, cmix_proto::RealPre& realpre, T const& hs, T const& ms, U const& data) {
-	size_t len = get_group_element_array_size(&ctx);
+	size_t len = ctx.nr_mixes * get_group_element_array_size(&ctx);
 	
 	std::vector<char*> msv1(ms.size(), nullptr);
 	std::vector<char const*> msv2(ms.size(), nullptr);
@@ -155,7 +155,7 @@ void fill_realtime_pre_message(CMixContext& ctx, cmix_proto::RealPre& realpre, T
 
 template <typename T>
 void fill_realtime_mix_message(CMixContext& ctx, cmix_proto::RealMix& realmix, T const& ms) {
-	size_t len = get_group_element_array_size(&ctx);
+	size_t len = ctx.nr_mixes * get_group_element_array_size(&ctx);
 	std::vector<char*> mv(ms.size(), nullptr);
 	std::vector<char const*> msv(ms.size(), nullptr);
 	for(int i = 0; i < ms.size(); ++i) {
@@ -175,11 +175,11 @@ void fill_realtime_mix_message(CMixContext& ctx, cmix_proto::RealMix& realmix, T
 
 void fill_realtime_post_message(CMixContext& ctx, cmix_proto::RealPost& realpost, cmix_proto::RealMix const& realmix) {
 	
-	size_t len = get_group_element_array_size(&ctx);
+	size_t len = ctx.nr_mixes * get_group_element_array_size(&ctx);
 	std::vector<char*> mv(ctx.nr_participants, nullptr);
 	for(size_t i = 0; i < ctx.nr_participants; ++i) {
 		std::string* m = realpost.add_m_epirs();
-		m->resize(len * ctx.nr_mixes);
+		m->resize(len);
 		mv[i] = &(*m)[0];
 	}
 	
@@ -204,7 +204,7 @@ void fill_realtime_post_message(CMixContext& ctx, cmix_proto::RealPost& realpost
 }
 
 void fill_realtime_post_message(CMixContext& ctx, cmix_proto::RealPost& n_realpost, cmix_proto::RealPost const& realpost) {
-	size_t len = get_group_element_array_size(&ctx);
+	size_t len = ctx.nr_mixes * get_group_element_array_size(&ctx);
 	std::vector<char*> mv(ctx.nr_participants, nullptr);
 	std::vector<char const*> mvs(ctx.nr_participants, nullptr);
 	for(size_t i = 0; i < ctx.nr_participants; ++i) {
@@ -431,7 +431,7 @@ void Node::handle_node_realpost(cmix_proto::RealPost const& realpost) {
 		auto& n_realpost = arena.get();
 		fill_realtime_post_message(cmix_ctx, n_realpost, realpost);
 		
-		size_t len = get_group_element_array_size(&cmix_ctx);
+		size_t len = cmix_ctx.nr_mixes * get_group_element_array_size(&cmix_ctx);
 		std::vector<std::string> message_strings(cmix_ctx.nr_participants);
 		std::vector<const char*> pirs(cmix_ctx.nr_participants, nullptr);
 		std::vector<char*> msgs(cmix_ctx.nr_participants, nullptr);
@@ -534,7 +534,7 @@ void Node::handle_node_message(cmix_proto::CMixMessage message)
 			break;
 		}
 		case cmix_proto::CMixMessage::ContentsCase::kCommitments: {
-			BOOST_LOG_TRIVIAL(trace) << "Handling PrePost";
+			BOOST_LOG_TRIVIAL(trace) << "Handling Commitments";
 			handle_node_commitments(message.commitments());
 			break;
 		}