From 04dfc3c569d017adef011eb370c98d5902b0c0cd Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Thu, 18 Aug 2016 12:22:30 +1200
Subject: [PATCH] Rework test to check for failure to return a spending key

---
 src/gtest/test_keystore.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/gtest/test_keystore.cpp b/src/gtest/test_keystore.cpp
index 8baf02cab..3d095ee56 100644
--- a/src/gtest/test_keystore.cpp
+++ b/src/gtest/test_keystore.cpp
@@ -5,19 +5,22 @@
 
 TEST(keystore_tests, store_and_retrieve_spending_key) {
     CBasicKeyStore keyStore;
+    libzcash::SpendingKey skOut;
 
     std::set<libzcash::PaymentAddress> addrs;
     keyStore.GetPaymentAddresses(addrs);
     ASSERT_EQ(0, addrs.size());
 
     auto sk = libzcash::SpendingKey::random();
-    keyStore.AddSpendingKey(sk);
-
     auto addr = sk.address();
-    ASSERT_TRUE(keyStore.HaveSpendingKey(addr));
 
-    libzcash::SpendingKey skOut;
-    keyStore.GetSpendingKey(addr, skOut);
+    // Sanity-check: we can't get a key we haven't added
+    ASSERT_FALSE(keyStore.HaveSpendingKey(addr));
+    ASSERT_FALSE(keyStore.GetSpendingKey(addr, skOut));
+
+    keyStore.AddSpendingKey(sk);
+    ASSERT_TRUE(keyStore.HaveSpendingKey(addr));
+    ASSERT_TRUE(keyStore.GetSpendingKey(addr, skOut));
     ASSERT_EQ(sk, skOut);
 
     keyStore.GetPaymentAddresses(addrs);