From 40dc060cb02d7986f4b724d970370c99391bb79c Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Wed, 1 Aug 2018 19:59:57 +0100
Subject: [PATCH] test: Update rpc_wallet_z_importexport to account for Sapling
 changes

---
 src/test/rpc_wallet_tests.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp
index 5064526ba..4b478df40 100644
--- a/src/test/rpc_wallet_tests.cpp
+++ b/src/test/rpc_wallet_tests.cpp
@@ -561,6 +561,9 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
     std::set<libzcash::SproutPaymentAddress> addrs;
     pwalletMain->GetPaymentAddresses(addrs);
     BOOST_CHECK(addrs.size()==0);
+    std::set<libzcash::SaplingPaymentAddress> saplingAddrs;
+    pwalletMain->GetSaplingPaymentAddresses(saplingAddrs);
+    BOOST_CHECK(saplingAddrs.empty());
 
     // verify import and export key
     for (int i = 0; i < n1; i++) {
@@ -586,7 +589,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
     // Verify we can list the keys imported
     BOOST_CHECK_NO_THROW(retValue = CallRPC("z_listaddresses"));
     UniValue arr = retValue.get_array();
-    BOOST_CHECK(arr.size() == n1);
+    BOOST_CHECK(arr.size() == (2 * n1));
 
     // Put addresses into a set
     std::unordered_set<std::string> myaddrs;
@@ -601,9 +604,10 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
 
     // Verify number of addresses stored in wallet is n1+n2
     int numAddrs = myaddrs.size();
-    BOOST_CHECK(numAddrs == n1+n2);
+    BOOST_CHECK(numAddrs == (2 * n1) + n2);
     pwalletMain->GetPaymentAddresses(addrs);
-    BOOST_CHECK(addrs.size()==numAddrs);
+    pwalletMain->GetSaplingPaymentAddresses(saplingAddrs);
+    BOOST_CHECK(addrs.size() + saplingAddrs.size() == numAddrs);
 
     // Ask wallet to list addresses
     BOOST_CHECK_NO_THROW(retValue = CallRPC("z_listaddresses"));