From 1960a3d2c6c9ea924e27ebf60be3860cad3e692c Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 23 Jul 2018 05:52:40 -1100 Subject: [PATCH] Test --- src/cc/faucet.cpp | 7 +++---- src/script/interpreter.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp index c9c3e5cf7..53a8d56eb 100644 --- a/src/cc/faucet.cpp +++ b/src/cc/faucet.cpp @@ -27,11 +27,11 @@ CC *MakeFaucetCond(CPubKey pk) { - std::vector pks; uint8_t evalcode = EVAL_ASSETS; + std::vector pks; uint8_t evalcode = EVAL_FAUCET; pks.push_back(CCNewSecp256k1(pk)); - CC *assetCC = CCNewEval(E_MARSHAL(ss << evalcode)); + CC *faucetCC = CCNewEval(E_MARSHAL(ss << evalcode)); CC *Sig = CCNewThreshold(1, pks); - return CCNewThreshold(2, {assetCC, Sig}); + return CCNewThreshold(2, {faucetCC, Sig}); } CTxOut MakeFaucetVout(CAmount nValue,CPubKey pk) @@ -112,7 +112,6 @@ bool FaucetValidate(Eval* eval,const CTransaction &tx) bool ProcessFaucet(Eval* eval, std::vector paramsNull,const CTransaction &ctx, unsigned int nIn) { - return(true); if ( paramsNull.size() != 0 ) // Don't expect params return eval->Invalid("Cannot have params"); else if ( ctx.vout.size() == 0 ) diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 2d117e8f0..4295d4ddc 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -1313,14 +1313,14 @@ int TransactionSignatureChecker::CheckCryptoCondition( } catch (logic_error ex) { return 0; } - int32_t z; //uint8_t *ptr; + //int32_t z; uint8_t *ptr; //ptr = (uint8_t *)scriptCode.data(); //for (z=0; zCheckEvalCondition(cond);