From 1f5f9d297b51c0dd2e5d4a2525e135db4240a535 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Mon, 23 Jul 2018 05:41:43 -1100
Subject: [PATCH] Test

---
 src/cc/eval.cpp            |  2 +-
 src/cc/faucet.cpp          | 17 ++++++++++-------
 src/script/interpreter.cpp | 18 +++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/cc/eval.cpp b/src/cc/eval.cpp
index 3f70b6466..97bb89402 100644
--- a/src/cc/eval.cpp
+++ b/src/cc/eval.cpp
@@ -35,7 +35,7 @@ bool RunCCEval(const CC *cond, const CTransaction &tx, unsigned int nIn)
     EvalRef eval;
 
     bool out = eval->Dispatch(cond, tx, nIn);
-    fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
+    //fprintf(stderr,"out %d vs %d isValid\n",(int32_t)out,(int32_t)eval->state.IsValid());
     assert(eval->state.IsValid() == out);
 
     if (eval->state.IsValid()) return true;
diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 56a6a6cfd..9ce6e48bf 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -176,14 +176,17 @@ std::string FaucetGet(uint64_t txfee)
         txfee = 10000;
     faucetpk = GetUnspendable(EVAL_FAUCET,0);
     mypk = pubkey2pk(Mypubkey());
-    if ( (inputs= AddFaucetInputs(mtx,faucetpk,nValue+txfee,60)) > 0 )
+    if ( AddNormalinputs(mtx,mypk,txfee,1) > 0 )
     {
-        mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
-        if ( inputs > nValue )
-            CCchange = (inputs - nValue - txfee);
-        if ( CCchange != 0 )
-            mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
-        return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
+        if ( (inputs= AddFaucetInputs(mtx,faucetpk,nValue,60)) > 0 )
+        {
+            if ( inputs > nValue )
+                CCchange = (inputs - nValue);
+            if ( CCchange != 0 )
+                mtx.vout.push_back(MakeFaucetVout(CCchange,faucetpk));
+            mtx.vout.push_back(CTxOut(nValue,CScript() << ParseHex(HexStr(mypk)) << OP_CHECKSIG));
+            return(FinalizeCCTx(EVAL_FAUCET,mtx,mypk,txfee,opret));
+        }
     }
     return(0);
 }
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp
index e6ed58fd5..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;
-    ptr = (uint8_t *)scriptCode.data();
-    for (z=0; z<scriptCode.size(); z++)
-        fprintf(stderr,"%02x",ptr[z]);
-    fprintf(stderr," <- CScript\n");
-    for (z=0; z<32; z++)
-        fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
-    fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);
+    //int32_t z; uint8_t *ptr;
+    //ptr = (uint8_t *)scriptCode.data();
+    //for (z=0; z<scriptCode.size(); z++)
+    //    fprintf(stderr,"%02x",ptr[z]);
+    //fprintf(stderr," <- CScript\n");
+    //for (z=0; z<32; z++)
+    //    fprintf(stderr,"%02x",((uint8_t *)&sighash)[z]);
+    //fprintf(stderr," sighash nIn.%d nHashType.%d %.8f id.%d\n",(int32_t)nIn,(int32_t)nHashType,(double)amount/COIN,(int32_t)consensusBranchId);
 
     VerifyEval eval = [] (CC *cond, void *checker) {
         return ((TransactionSignatureChecker*)checker)->CheckEvalCondition(cond);
@@ -1328,7 +1328,7 @@ int TransactionSignatureChecker::CheckCryptoCondition(
 
     int out = cc_verify(cond, (const unsigned char*)&sighash, 32, 0,
                         condBin.data(), condBin.size(), eval, (void*)this);
-    fprintf(stderr,"out.%d from cc_verify\n",(int32_t)out);
+    //fprintf(stderr,"out.%d from cc_verify\n",(int32_t)out);
     cc_free(cond);
     return out;
 }