Skip to content

Commit bad06a9

Browse files
jeffro256jeffro256
committed
carrot+fcmp: fix tests for key image dev changes
1 parent f90991d commit bad06a9

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎src/wallet/tx_builder.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,7 @@ cryptonote::transaction finalize_fcmps_and_range_proofs(
313313
const fcmp_pp::curve_trees::CurveTreesV1 &curve_trees);
314314

315315
//! @TODO: accept already-calculated rerandomized outputs and their blinds
316+
//! @TODO: rename, there are not `transfer_details` structs required anymore
316317
cryptonote::transaction finalize_all_proofs_from_transfer_details(
317318
const carrot::CarrotTransactionProposalV1 &tx_proposal,
318319
const fcmp_pp::curve_trees::TreeCacheV1 &tree_cache,

‎tests/core_tests/fcmp_pp.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ bool gen_fcmp_pp_tx_validation_base::generate_with(std::vector<test_event_entry>
203203
CHECK_AND_ASSERT_MES(tx_proposals.size() == 1, false, "Expected 1 tx proposal");
204204

205205
rct_txes.back() = tools::wallet::finalize_all_proofs_from_transfer_details(tx_proposals.front(),
206-
{wallet2_td},
207206
tree_cache,
208207
*fcmp_pp::curve_trees::curve_trees_v1(),
209208
miner_accounts[0].get_keys());

‎tests/unit_tests/wallet_hot_cold.cpp‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ TEST(wallet_hot_cold, export_import_simple)
185185
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
186186
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
187187
bob_cold.cn_addr_dev,
188-
bob_cold.key_image_dev);
188+
bob_cold.legacy_key_image_dev);
189189
EXPECT_EQ(reward, imported_td.amount());
190190
EXPECT_TRUE(verify_cold_sal(imported_td));
191191
}
@@ -214,7 +214,7 @@ TEST(wallet_hot_cold, export_import_simple)
214214
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
215215
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
216216
bob_cold.cn_addr_dev,
217-
bob_cold.key_image_dev);
217+
bob_cold.legacy_key_image_dev);
218218
EXPECT_EQ(amount, imported_td.amount());
219219
EXPECT_TRUE(verify_cold_sal(imported_td));
220220
}
@@ -243,7 +243,7 @@ TEST(wallet_hot_cold, export_import_simple)
243243
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
244244
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
245245
bob_cold.cn_addr_dev,
246-
bob_cold.key_image_dev);
246+
bob_cold.legacy_key_image_dev);
247247
EXPECT_EQ(reward, imported_td.amount());
248248
EXPECT_TRUE(verify_cold_sal(imported_td));
249249
}
@@ -272,7 +272,7 @@ TEST(wallet_hot_cold, export_import_simple)
272272
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
273273
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
274274
bob_cold.cn_addr_dev,
275-
bob_cold.key_image_dev);
275+
bob_cold.legacy_key_image_dev);
276276
EXPECT_EQ(amount, imported_td.amount());
277277
EXPECT_TRUE(verify_cold_sal(imported_td));
278278
}
@@ -301,7 +301,7 @@ TEST(wallet_hot_cold, export_import_simple)
301301
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
302302
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
303303
bob_cold.cn_addr_dev,
304-
bob_cold.key_image_dev);
304+
bob_cold.legacy_key_image_dev);
305305
EXPECT_EQ(amount, imported_td.amount());
306306
EXPECT_TRUE(verify_cold_sal(imported_td));
307307
}
@@ -330,7 +330,7 @@ TEST(wallet_hot_cold, export_import_simple)
330330
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
331331
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
332332
bob_cold.cn_addr_dev,
333-
bob_cold.key_image_dev);
333+
bob_cold.legacy_key_image_dev);
334334
EXPECT_EQ(reward, imported_td.amount());
335335
EXPECT_TRUE(verify_cold_sal(imported_td));
336336
}
@@ -360,7 +360,7 @@ TEST(wallet_hot_cold, export_import_simple)
360360
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
361361
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
362362
bob_cold.cn_addr_dev,
363-
bob_cold.key_image_dev);
363+
bob_cold.legacy_key_image_dev);
364364
EXPECT_EQ(amount, imported_td.amount());
365365
EXPECT_TRUE(verify_cold_sal(imported_td));
366366
}
@@ -390,7 +390,7 @@ TEST(wallet_hot_cold, export_import_simple)
390390
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
391391
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
392392
bob_cold.cn_addr_dev,
393-
bob_cold.key_image_dev);
393+
bob_cold.legacy_key_image_dev);
394394
EXPECT_EQ(amount, imported_td.amount());
395395
EXPECT_TRUE(verify_cold_sal(imported_td));
396396
}
@@ -419,7 +419,7 @@ TEST(wallet_hot_cold, export_import_simple)
419419
= tools::wallet::cold::export_cold_carrot_output(scanned_enotes.front(), bob_hot.cn_addr_dev);
420420
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
421421
bob_cold.cn_addr_dev,
422-
bob_cold.key_image_dev);
422+
bob_cold.legacy_key_image_dev);
423423
EXPECT_EQ(reward, imported_td.amount());
424424
EXPECT_TRUE(verify_cold_sal(imported_td));
425425
}
@@ -449,7 +449,7 @@ TEST(wallet_hot_cold, export_import_simple)
449449
= tools::wallet::cold::export_cold_carrot_output(scanned_enotes.front(), bob_hot.cn_addr_dev);
450450
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
451451
bob_cold.cn_addr_dev,
452-
bob_cold.key_image_dev);
452+
bob_cold.legacy_key_image_dev);
453453
EXPECT_EQ(amount, imported_td.amount());
454454
EXPECT_TRUE(verify_cold_sal(imported_td));
455455
}
@@ -479,7 +479,7 @@ TEST(wallet_hot_cold, export_import_simple)
479479
= tools::wallet::cold::export_cold_carrot_output(dest_enote, bob_hot.cn_addr_dev);
480480
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
481481
bob_cold.cn_addr_dev,
482-
bob_cold.key_image_dev);
482+
bob_cold.legacy_key_image_dev);
483483
EXPECT_EQ(amount, imported_td.amount());
484484
EXPECT_TRUE(verify_cold_sal(imported_td));
485485
}
@@ -513,7 +513,7 @@ TEST(wallet_hot_cold, export_import_simple)
513513
= tools::wallet::cold::export_cold_carrot_output(scanned_enotes.front(), bob_hot.cn_addr_dev);
514514
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
515515
bob_cold.cn_addr_dev,
516-
bob_cold.key_image_dev);
516+
bob_cold.legacy_key_image_dev);
517517
EXPECT_EQ(amount, imported_td.amount());
518518
EXPECT_TRUE(verify_cold_sal(imported_td));
519519
}
@@ -543,7 +543,7 @@ TEST(wallet_hot_cold, export_import_simple)
543543
= tools::wallet::cold::export_cold_carrot_output(scanned_enotes.front(), bob_hot.cn_addr_dev);
544544
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
545545
bob_cold.cn_addr_dev,
546-
bob_cold.key_image_dev);
546+
bob_cold.legacy_key_image_dev);
547547
EXPECT_EQ(amount, imported_td.amount());
548548
EXPECT_TRUE(verify_cold_sal(imported_td));
549549
}
@@ -583,7 +583,7 @@ TEST(wallet_hot_cold, export_import_simple)
583583
= tools::wallet::cold::export_cold_carrot_output(dest_enote, bob_hot.cn_addr_dev);
584584
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
585585
bob_cold.cn_addr_dev,
586-
bob_cold.key_image_dev);
586+
bob_cold.legacy_key_image_dev);
587587
EXPECT_EQ(amount, imported_td.amount());
588588
EXPECT_TRUE(verify_cold_sal(imported_td));
589589
}
@@ -682,7 +682,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
682682
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
683683
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
684684
bob_cold.cn_addr_dev,
685-
bob_cold.key_image_dev);
685+
bob_cold.legacy_key_image_dev);
686686
EXPECT_EQ(amount, imported_td.amount());
687687
EXPECT_TRUE(verify_serialization_completeness(etd));
688688
}
@@ -710,7 +710,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
710710
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
711711
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
712712
bob_cold.cn_addr_dev,
713-
bob_cold.key_image_dev);
713+
bob_cold.legacy_key_image_dev);
714714
EXPECT_EQ(reward, imported_td.amount());
715715
EXPECT_TRUE(verify_serialization_completeness(etd));
716716
}
@@ -738,7 +738,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
738738
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
739739
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
740740
bob_cold.cn_addr_dev,
741-
bob_cold.key_image_dev);
741+
bob_cold.legacy_key_image_dev);
742742
EXPECT_EQ(amount, imported_td.amount());
743743
EXPECT_TRUE(verify_serialization_completeness(etd));
744744
}
@@ -766,7 +766,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
766766
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
767767
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
768768
bob_cold.cn_addr_dev,
769-
bob_cold.key_image_dev);
769+
bob_cold.legacy_key_image_dev);
770770
EXPECT_EQ(amount, imported_td.amount());
771771
EXPECT_TRUE(verify_serialization_completeness(etd));
772772
}
@@ -794,7 +794,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
794794
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
795795
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
796796
bob_cold.cn_addr_dev,
797-
bob_cold.key_image_dev);
797+
bob_cold.legacy_key_image_dev);
798798
EXPECT_EQ(reward, imported_td.amount());
799799
EXPECT_TRUE(verify_serialization_completeness(etd));
800800
}
@@ -823,7 +823,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
823823
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
824824
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
825825
bob_cold.cn_addr_dev,
826-
bob_cold.key_image_dev);
826+
bob_cold.legacy_key_image_dev);
827827
EXPECT_EQ(amount, imported_td.amount());
828828
EXPECT_TRUE(verify_serialization_completeness(etd));
829829
}
@@ -852,7 +852,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
852852
= tools::wallet::cold::export_cold_pre_carrot_output(scanned_enotes.front());
853853
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_pre_carrot_output(etd,
854854
bob_cold.cn_addr_dev,
855-
bob_cold.key_image_dev);
855+
bob_cold.legacy_key_image_dev);
856856
EXPECT_EQ(amount, imported_td.amount());
857857
EXPECT_TRUE(verify_serialization_completeness(etd));
858858
}
@@ -880,7 +880,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
880880
= tools::wallet::cold::export_cold_carrot_output(scanned_enotes.front(), bob_hot.cn_addr_dev);
881881
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
882882
bob_cold.cn_addr_dev,
883-
bob_cold.key_image_dev);
883+
bob_cold.legacy_key_image_dev);
884884
EXPECT_EQ(reward, imported_td.amount());
885885
EXPECT_TRUE(verify_serialization_completeness(etd));
886886
}
@@ -909,7 +909,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
909909
= tools::wallet::cold::export_cold_carrot_output(scanned_enotes.front(), bob_hot.cn_addr_dev);
910910
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
911911
bob_cold.cn_addr_dev,
912-
bob_cold.key_image_dev);
912+
bob_cold.legacy_key_image_dev);
913913
EXPECT_EQ(amount, imported_td.amount());
914914
EXPECT_TRUE(verify_serialization_completeness(etd));
915915
}
@@ -938,7 +938,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
938938
= tools::wallet::cold::export_cold_carrot_output(dest_enote, bob_hot.cn_addr_dev);
939939
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
940940
bob_cold.cn_addr_dev,
941-
bob_cold.key_image_dev);
941+
bob_cold.legacy_key_image_dev);
942942
EXPECT_EQ(amount, imported_td.amount());
943943
EXPECT_TRUE(verify_serialization_completeness(etd));
944944
}
@@ -971,7 +971,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
971971
= tools::wallet::cold::export_cold_carrot_output(scanned_enotes.front(), bob_hot.cn_addr_dev);
972972
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
973973
bob_cold.cn_addr_dev,
974-
bob_cold.key_image_dev);
974+
bob_cold.legacy_key_image_dev);
975975
EXPECT_EQ(amount, imported_td.amount());
976976
EXPECT_TRUE(verify_serialization_completeness(etd));
977977
}
@@ -1000,7 +1000,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
10001000
= tools::wallet::cold::export_cold_carrot_output(scanned_enotes.front(), bob_hot.cn_addr_dev);
10011001
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
10021002
bob_cold.cn_addr_dev,
1003-
bob_cold.key_image_dev);
1003+
bob_cold.legacy_key_image_dev);
10041004
EXPECT_EQ(amount, imported_td.amount());
10051005
EXPECT_TRUE(verify_serialization_completeness(etd));
10061006
}
@@ -1039,7 +1039,7 @@ TEST(wallet_hot_cold, export_serialization_completeness)
10391039
= tools::wallet::cold::export_cold_carrot_output(dest_enote, bob_hot.cn_addr_dev);
10401040
const wallet2_basic::transfer_details imported_td = tools::wallet::cold::import_cold_carrot_output(etd,
10411041
bob_cold.cn_addr_dev,
1042-
bob_cold.key_image_dev);
1042+
bob_cold.legacy_key_image_dev);
10431043
EXPECT_EQ(amount, imported_td.amount());
10441044
EXPECT_TRUE(verify_serialization_completeness(etd));
10451045
}

0 commit comments

Comments
 (0)