Remove more remnants of JoinSplits

src/zcash/JoinSplit.hpp

@@ -2,8 +2,8 @@
 // Distributed under the GPLv3 software license, see the accompanying
 // file COPYING or https://www.gnu.org/licenses/gpl-3.0.en.html
 
-#ifndef ZC_JOINSPLIT_H_
-#define ZC_JOINSPLIT_H_
+#ifndef HUSH_JOINSPLIT_H_
+#define HUSH_JOINSPLIT_H_
 
 #include "Zcash.h"
 #include "Proof.hpp"
@@ -13,7 +13,6 @@
 #include "NoteEncryption.hpp"
 #include "uint256.h"
 #include "uint252.h"
-
 #include <array>
 
 namespace libzcash {
@@ -25,16 +24,13 @@ static constexpr size_t GROTH_PROOF_SIZE = (
 
 typedef std::array<unsigned char, GROTH_PROOF_SIZE> GrothProof;
 typedef boost::variant<PHGRProof, GrothProof> SproutProof;
-
 class JSInput { };
-
 class JSOutput { };
-
 template<size_t NumInputs, size_t NumOutputs>
 class JoinSplit { };
 
 }
 
-typedef libzcash::JoinSplit<ZC_NUM_JS_INPUTS, ZC_NUM_JS_OUTPUTS> ZCJoinSplit;
+typedef libzcash::JoinSplit<HUSH_NUM_JS_INPUTS, HUSH_NUM_JS_OUTPUTS> ZCJoinSplit;
 
-#endif // ZC_JOINSPLIT_H_
+#endif // HUSH_JOINSPLIT_H_

src/zcash/NoteEncryption.hpp

@@ -117,7 +117,7 @@ public:
     }
 
     // Encrypts `message` with `pk_enc` and returns the ciphertext.
-    // This is only called ZC_NUM_JS_OUTPUTS times for a given instantiation; 
+    // This is only called HUSH_NUM_JS_OUTPUTS times for a given instantiation; 
     // but can be called 255 times before the nonce-space runs out.
     Ciphertext encrypt(const uint256 &pk_enc,
                        const Plaintext &message

src/zcash/Zcash.h

@@ -4,8 +4,8 @@
 #ifndef ZC_ZCASH_H_
 #define ZC_ZCASH_H_
 
-#define ZC_NUM_JS_INPUTS 2
-#define ZC_NUM_JS_OUTPUTS 2
+#define HUSH_NUM_JS_INPUTS 2
+#define HUSH_NUM_JS_OUTPUTS 2
 #define INCREMENTAL_MERKLE_TREE_DEPTH 29
 #define INCREMENTAL_MERKLE_TREE_DEPTH_TESTING 4