Merge pull request bcosorg#16 from JUZIX-DEV/master

delete pailler completely
cailin186 · Aug 4, 2017 · b66f8ed · b66f8ed
2 parents ea2d7d5 + 73f5f8d
commit b66f8ed
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/libevm/CMakeLists.txt b/libevm/CMakeLists.txt
@@ -38,7 +38,7 @@ include_directories(../libodbc/include
 
 target_link_libraries(evm ${Eth_ETHCORE_LIBRARIES})
 target_link_libraries(evm ${Eth_EVMCORE_LIBRARIES})
-target_link_libraries(evm pailler)
+target_link_libraries(evm paillier)
 target_include_directories(evm PRIVATE .. ${JSONCPP_INCLUDE_DIR})
 
 if (EVMJIT)

diff --git a/libpaillier/CMakeLists.txt b/libpaillier/CMakeLists.txt
@@ -2,6 +2,6 @@ aux_source_directory(. SRC_LIST)
 
 file(GLOB HEADERS "*.h")
 
-add_library(pailler ${SRC_LIST} ${HEADERS})
+add_library(paillier ${SRC_LIST} ${HEADERS})
 
-install(TARGETS pailler RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 
+install(TARGETS paillier RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 
diff --git a/libpaillier/macro.h b/libpaillier/macro.h
@@ -17,7 +17,7 @@ extern "C"{
 #define Plus						0x00000000
 #define Minus						0x00000001
 
-//macro for BN in pailler
+//macro for BN in paillier
 #define PaiBNBitLen					1024
 #define PaiBNWordLen				32
 #define PaiPrimeWordLen				16

diff --git a/tool/demoTestPaillie.js b/tool/demoTestPaillie.js
@@ -18,6 +18,7 @@ console.log(config);
 var filename="TestPaillier";
 var address=fs.readFileSync(config.Ouputpath+filename+'.address','utf-8');
 var abi=JSON.parse(fs.readFileSync(config.Ouputpath/*+filename+".sol:"*/+filename+'.abi', 'utf-8'));
+
 var contract = web3.eth.contract(abi);
 var instance = contract.at(address);