DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Auto merge of #1089 - ThisIsNotOfficialCodeItsJustForks:t960-rename-zerocash-zcash, r=ebfull

Browse Source 
Rename zerocash to zcash in places

Closes #960.
This commit is contained in:
zkbot
2016-07-13 01:51:22 +00:00
parent 46187fbe7a 4e117b63c6
commit 2b75ad0bd4
5 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -9,13 +9,8 @@ src/bitcoin-tx
src/test/test_bitcoin src/test/test_bitcoin
src/qt/test/test_bitcoin-qt src/qt/test/test_bitcoin-qt
# zerocash tests and utilities # Zcash utilities
src/zcash/GenerateParams src/zcash/GenerateParams
src/zerocash/GenerateParamsForFiles
src/zerocash/tests/merkleTest
src/zerocash/tests/utilTest
src/zerocash/tests/zerocashTest
src/zerocash/tests/test_zerocash_pour_ppzksnark
*zcashTest.pk *zcashTest.pk
*zcashTest.vk *zcashTest.vk

2
Makefile.am
View File

@@ -222,7 +222,7 @@ endif
dist_noinst_SCRIPTS = autogen.sh dist_noinst_SCRIPTS = autogen.sh
EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zerocash $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/rpc-tests.sh qa/pull-tester/run-bitcoin-cli qa/rpc-tests qa/zcash $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER) CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)

4
depends/packages/packages.mk
View File

@@ -1,5 +1,5 @@
zerocash_packages := libsnark libgmp libsodium zcash_packages := libsnark libgmp libsodium
packages := boost openssl $(zerocash_packages) googletest googlemock packages := boost openssl $(zcash_packages) googletest googlemock
native_packages := native_ccache native_comparisontool native_packages := native_ccache native_comparisontool
qt_native_packages = native_protobuf qt_native_packages = native_protobuf

2
src/Makefile.am
View File

@@ -404,7 +404,7 @@ bitcoin_tx_LDADD = \
bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS) bitcoin_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
# #
# zerocash protocol primitives # # zcash protocol primitives #
libzcash_a_SOURCES = \ libzcash_a_SOURCES = \
zcash/IncrementalMerkleTree.cpp \ zcash/IncrementalMerkleTree.cpp \
zcash/NoteEncryption.cpp \ zcash/NoteEncryption.cpp \

4
src/test/transaction_tests.cpp
View File

@@ -305,8 +305,8 @@ BOOST_AUTO_TEST_CASE(test_basic_pour_verification)
// on all platforms and would gently push us down an ugly // on all platforms and would gently push us down an ugly
// path. We should just fix the assertions. // path. We should just fix the assertions.
// //
// Also, it's generally libzerocash's job to ensure // Also, it's generally libzcash's job to ensure the
// the integrity of the scheme through its own tests. // integrity of the scheme through its own tests.
// construct the r1cs keypair // construct the r1cs keypair
auto p = ZCJoinSplit::Generate(); auto p = ZCJoinSplit::Generate();