|
|
@ -516,7 +516,7 @@ TEST(WalletTests, FindMySaplingNotes) { |
|
|
|
EXPECT_EQ(0, noteMap.size()); |
|
|
|
|
|
|
|
// Add spending key to wallet, so Sapling notes can be found
|
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk)); |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk, pk)); |
|
|
|
ASSERT_TRUE(wallet.HaveSaplingSpendingKey(fvk)); |
|
|
|
noteMap = wallet.FindMySaplingNotes(wtx); |
|
|
|
EXPECT_EQ(2, noteMap.size()); |
|
|
@ -630,7 +630,7 @@ TEST(WalletTests, GetConflictedSaplingNotes) { |
|
|
|
auto ivk = fvk.in_viewing_key(); |
|
|
|
auto pk = sk.DefaultAddress(); |
|
|
|
|
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk)); |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk, pk)); |
|
|
|
ASSERT_TRUE(wallet.HaveSaplingSpendingKey(fvk)); |
|
|
|
|
|
|
|
// Generate note A
|
|
|
@ -815,7 +815,7 @@ TEST(WalletTests, SaplingNullifierIsSpent) { |
|
|
|
auto tx = maybe_tx.get(); |
|
|
|
|
|
|
|
CWalletTx wtx {&wallet, tx}; |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk)); |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk, pk)); |
|
|
|
ASSERT_TRUE(wallet.HaveSaplingSpendingKey(fvk)); |
|
|
|
|
|
|
|
// Manually compute the nullifier based on the known position
|
|
|
@ -912,7 +912,7 @@ TEST(WalletTests, NavigateFromSaplingNullifierToNote) { |
|
|
|
auto tx = maybe_tx.get(); |
|
|
|
|
|
|
|
CWalletTx wtx {&wallet, tx}; |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk)); |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk, pk)); |
|
|
|
ASSERT_TRUE(wallet.HaveSaplingSpendingKey(fvk)); |
|
|
|
|
|
|
|
// Manually compute the nullifier based on the expected position
|
|
|
@ -1048,7 +1048,7 @@ TEST(WalletTests, SpentSaplingNoteIsFromMe) { |
|
|
|
auto tx = maybe_tx.get(); |
|
|
|
|
|
|
|
CWalletTx wtx {&wallet, tx}; |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk)); |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk, pk)); |
|
|
|
ASSERT_TRUE(wallet.HaveSaplingSpendingKey(fvk)); |
|
|
|
|
|
|
|
// Fake-mine the transaction
|
|
|
@ -1751,7 +1751,7 @@ TEST(WalletTests, UpdatedSaplingNoteData) { |
|
|
|
|
|
|
|
// Wallet contains fvk1 but not fvk2
|
|
|
|
CWalletTx wtx {&wallet, tx}; |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk)); |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk, pk)); |
|
|
|
ASSERT_TRUE(wallet.HaveSaplingSpendingKey(fvk)); |
|
|
|
ASSERT_FALSE(wallet.HaveSaplingSpendingKey(fvk2)); |
|
|
|
|
|
|
@ -1784,7 +1784,7 @@ TEST(WalletTests, UpdatedSaplingNoteData) { |
|
|
|
wtx = wallet.mapWallet[hash]; |
|
|
|
|
|
|
|
// Now lets add key fvk2 so wallet can find the payment note sent to pk2
|
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk2)); |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk2, pk2)); |
|
|
|
ASSERT_TRUE(wallet.HaveSaplingSpendingKey(fvk2)); |
|
|
|
CWalletTx wtx2 = wtx; |
|
|
|
auto saplingNoteData2 = wallet.FindMySaplingNotes(wtx2); |
|
|
@ -1881,7 +1881,7 @@ TEST(WalletTests, MarkAffectedSaplingTransactionsDirty) { |
|
|
|
auto ivk = fvk.in_viewing_key(); |
|
|
|
auto pk = sk.DefaultAddress(); |
|
|
|
|
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk)); |
|
|
|
ASSERT_TRUE(wallet.AddSaplingZKey(sk, pk)); |
|
|
|
ASSERT_TRUE(wallet.HaveSaplingSpendingKey(fvk)); |
|
|
|
|
|
|
|
// Set up transparent address
|
|
|
|