Call LoadProofParameters() in gtests that need proofs
This commit is contained in:
parent
8f68166c24
commit
f1d652fc78
|
@ -2,6 +2,7 @@
|
|||
#include "key.h"
|
||||
#include "pubkey.h"
|
||||
#include "util.h"
|
||||
#include "utiltest.h"
|
||||
|
||||
#include "librustzcash.h"
|
||||
#include <sodium.h>
|
||||
|
|
|
@ -1141,6 +1141,8 @@ TEST(ChecktransactionTests, InvalidShieldedCoinbase) {
|
|||
}
|
||||
|
||||
TEST(ChecktransactionTests, HeartwoodAcceptsShieldedCoinbase) {
|
||||
LoadProofParameters();
|
||||
|
||||
RegtestActivateHeartwood(false, Consensus::NetworkUpgrade::ALWAYS_ACTIVE);
|
||||
auto chainparams = Params();
|
||||
|
||||
|
@ -1224,6 +1226,8 @@ TEST(ChecktransactionTests, HeartwoodAcceptsShieldedCoinbase) {
|
|||
// bindingSig from https://zips.z.cash/protocol/protocol.pdf#txnencoding are
|
||||
// applied to coinbase transactions.
|
||||
TEST(ChecktransactionTests, HeartwoodEnforcesSaplingRulesOnShieldedCoinbase) {
|
||||
LoadProofParameters();
|
||||
|
||||
RegtestActivateHeartwood(false, Consensus::NetworkUpgrade::ALWAYS_ACTIVE);
|
||||
auto chainparams = Params();
|
||||
|
||||
|
|
|
@ -48,6 +48,8 @@ TEST(RecursiveDynamicUsageTests, TestTransactionJoinSplit)
|
|||
|
||||
TEST(RecursiveDynamicUsageTests, TestTransactionSaplingToSapling)
|
||||
{
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
||||
auto sk = libzcash::SaplingSpendingKey::random();
|
||||
|
@ -67,6 +69,8 @@ TEST(RecursiveDynamicUsageTests, TestTransactionSaplingToSapling)
|
|||
|
||||
TEST(RecursiveDynamicUsageTests, TestTransactionTransparentToSapling)
|
||||
{
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
||||
CBasicKeyStore keystore;
|
||||
|
@ -88,6 +92,8 @@ TEST(RecursiveDynamicUsageTests, TestTransactionTransparentToSapling)
|
|||
|
||||
TEST(RecursiveDynamicUsageTests, TestTransactionSaplingToTransparent)
|
||||
{
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
||||
CBasicKeyStore keystore;
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
#include "primitives/transaction.h"
|
||||
#include "proof_verifier.h"
|
||||
#include "transaction_builder.h"
|
||||
#include "utiltest.h"
|
||||
#include "zcash/JoinSplit.hpp"
|
||||
#include "zcash/Note.hpp"
|
||||
#include "zcash/NoteEncryption.hpp"
|
||||
|
@ -309,6 +310,8 @@ void increment_note_witnesses(
|
|||
|
||||
TEST(Joinsplit, FullApiTest)
|
||||
{
|
||||
LoadProofParameters();
|
||||
|
||||
{
|
||||
std::vector<SproutWitness> witnesses;
|
||||
SproutMerkleTree tree;
|
||||
|
|
|
@ -110,6 +110,8 @@ TEST(MempoolLimitTests, WeightedTxTreeCheckSizeAfterDropping)
|
|||
|
||||
TEST(MempoolLimitTests, WeightedTxInfoFromTx)
|
||||
{
|
||||
LoadProofParameters();
|
||||
|
||||
// The transaction creation is based on the test:
|
||||
// test_transaction_builder.cpp/TEST(TransactionBuilder, SetFee)
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
|
|
@ -74,6 +74,8 @@ public:
|
|||
|
||||
TEST(TransactionBuilder, TransparentToSapling)
|
||||
{
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
||||
CBasicKeyStore keystore;
|
||||
|
@ -113,6 +115,8 @@ TEST(TransactionBuilder, TransparentToSapling)
|
|||
}
|
||||
|
||||
TEST(TransactionBuilder, SaplingToSapling) {
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
||||
auto sk = libzcash::SaplingSpendingKey::random();
|
||||
|
@ -150,6 +154,8 @@ TEST(TransactionBuilder, SaplingToSapling) {
|
|||
}
|
||||
|
||||
TEST(TransactionBuilder, SaplingToSprout) {
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
||||
auto sk = libzcash::SaplingSpendingKey::random();
|
||||
|
@ -188,6 +194,8 @@ TEST(TransactionBuilder, SaplingToSprout) {
|
|||
}
|
||||
|
||||
TEST(TransactionBuilder, SproutToSproutAndSapling) {
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
||||
auto sk = libzcash::SaplingSpendingKey::random();
|
||||
|
@ -270,6 +278,8 @@ TEST(TransactionBuilder, RejectsInvalidTransparentOutput)
|
|||
|
||||
TEST(TransactionBuilder, FailsWithNegativeChange)
|
||||
{
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
||||
// Generate dummy Sapling address
|
||||
|
@ -314,6 +324,8 @@ TEST(TransactionBuilder, FailsWithNegativeChange)
|
|||
|
||||
TEST(TransactionBuilder, ChangeOutput)
|
||||
{
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
||||
// Generate dummy Sapling address
|
||||
|
@ -393,6 +405,8 @@ TEST(TransactionBuilder, ChangeOutput)
|
|||
|
||||
TEST(TransactionBuilder, SetFee)
|
||||
{
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
|
||||
// Generate dummy Sapling address
|
||||
|
|
|
@ -375,6 +375,8 @@ TEST(WalletTests, SetSproutNoteAddrsInCWalletTx) {
|
|||
}
|
||||
|
||||
TEST(WalletTests, SetSaplingNoteAddrsInCWalletTx) {
|
||||
LoadProofParameters();
|
||||
|
||||
std::vector<libzcash::Zip212Enabled> zip_212_enabled = {libzcash::Zip212Enabled::BeforeZip212, libzcash::Zip212Enabled::AfterZip212};
|
||||
const Consensus::Params& (*activations [])() = {RegtestActivateSapling, RegtestActivateCanopy};
|
||||
void (*deactivations [])() = {RegtestDeactivateSapling, RegtestDeactivateCanopy};
|
||||
|
@ -524,6 +526,8 @@ TEST(WalletTests, GetSproutNoteNullifier) {
|
|||
}
|
||||
|
||||
TEST(WalletTests, FindMySaplingNotes) {
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
TestWallet wallet(Params());
|
||||
LOCK(wallet.cs_wallet);
|
||||
|
@ -653,6 +657,8 @@ TEST(WalletTests, GetConflictedSproutNotes) {
|
|||
|
||||
// Generate note A and spend to create note B, from which we spend to create two conflicting transactions
|
||||
TEST(WalletTests, GetConflictedSaplingNotes) {
|
||||
LoadProofParameters();
|
||||
|
||||
std::vector<libzcash::Zip212Enabled> zip_212_enabled = {libzcash::Zip212Enabled::BeforeZip212, libzcash::Zip212Enabled::AfterZip212};
|
||||
const Consensus::Params& (*activations [])() = {RegtestActivateSapling, RegtestActivateCanopy};
|
||||
void (*deactivations [])() = {RegtestDeactivateSapling, RegtestDeactivateCanopy};
|
||||
|
@ -820,6 +826,8 @@ TEST(WalletTests, SproutNullifierIsSpent) {
|
|||
}
|
||||
|
||||
TEST(WalletTests, SaplingNullifierIsSpent) {
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
TestWallet wallet(Params());
|
||||
LOCK2(cs_main, wallet.cs_wallet);
|
||||
|
@ -905,6 +913,8 @@ TEST(WalletTests, NavigateFromSproutNullifierToNote) {
|
|||
}
|
||||
|
||||
TEST(WalletTests, NavigateFromSaplingNullifierToNote) {
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
TestWallet wallet(Params());
|
||||
LOCK2(cs_main, wallet.cs_wallet);
|
||||
|
@ -1028,6 +1038,8 @@ TEST(WalletTests, SpentSproutNoteIsFromMe) {
|
|||
|
||||
// Create note A, spend A to create note B, spend and verify note B is from me.
|
||||
TEST(WalletTests, SpentSaplingNoteIsFromMe) {
|
||||
LoadProofParameters();
|
||||
|
||||
std::vector<libzcash::Zip212Enabled> zip_212_enabled = {libzcash::Zip212Enabled::BeforeZip212, libzcash::Zip212Enabled::AfterZip212};
|
||||
const Consensus::Params& (*activations [])() = {RegtestActivateSapling, RegtestActivateCanopy};
|
||||
void (*deactivations [])() = {RegtestDeactivateSapling, RegtestDeactivateCanopy};
|
||||
|
@ -1840,6 +1852,8 @@ TEST(WalletTests, UpdatedSproutNoteData) {
|
|||
}
|
||||
|
||||
TEST(WalletTests, UpdatedSaplingNoteData) {
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
TestWallet wallet(Params());
|
||||
LOCK2(cs_main, wallet.cs_wallet);
|
||||
|
@ -1983,6 +1997,8 @@ TEST(WalletTests, MarkAffectedSproutTransactionsDirty) {
|
|||
}
|
||||
|
||||
TEST(WalletTests, MarkAffectedSaplingTransactionsDirty) {
|
||||
LoadProofParameters();
|
||||
|
||||
auto consensusParams = RegtestActivateSapling();
|
||||
TestWallet wallet(Params());
|
||||
LOCK2(cs_main, wallet.cs_wallet);
|
||||
|
|
Loading…
Reference in New Issue