Remove duplicate pegin test

stevenroose · stevenroose · commit a9c033195be6 · 2018-11-26T17:49:19.000Z
v0,14 doesn't have the CheckTxInputs check later in this method.
Since the pegins are checked in that method, this check seemed
redundant.
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -722,23 +722,6 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
             }
         }
 
-        // ELEMENTS:
-        // Extract peg-in inputs, pass set to mempool entry. Validity of pegins checked in CheckInputs
-        for (unsigned int i = 0; i < tx.vin.size(); i++) {
-            if (tx.vin[i].m_is_pegin) {
-                // Quick check of pegin witness and prevout to extract db entry
-                if (tx.vin[i].m_pegin_witness.stack.size() < 6 || uint256(tx.vin[i].m_pegin_witness.stack[2]).IsNull() || tx.vin[i].prevout.hash.IsNull()) {
-                    return state.Invalid(false, REJECT_INVALID, "pegin-no-witness");
-                }
-                std::pair<uint256, COutPoint> pegin = std::make_pair(uint256(tx.vin[i].m_pegin_witness.stack[2]), tx.vin[i].prevout);
-                // This assumes non-null prevout and genesis block hash
-                if (view.IsWithdrawSpent(pegin)) {
-                    return state.Invalid(false, REJECT_DUPLICATE, "pegin-already-claimed");
-                }
-                setPeginsSpent.insert(pegin);
-            }
-        }
-
         // Bring the best block into scope
         view.GetBestBlock();
 
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -5184,7 +5184,7 @@ UniValue claimpegin(const JSONRPCRequest& request)
     UniValue varr(UniValue::VARR);
     varr.push_back(ret["hex"]);
     request2.params = varr;
-    UniValue result = signrawtransaction(request2);
+    UniValue result = signrawtransactionwithwallet(request2);
 
     // Send it
     JSONRPCRequest request3;
diff --git a/test/functional/feature_fedpeg.py b/test/functional/feature_fedpeg.py
@@ -273,7 +273,7 @@ def run_test(self):
                 # since this wallet originated the claim_script itself
                 sidechain.createrawpegin(raw, proof, addrs["claim_script"])
                 sidechain.createrawpegin(raw, proof)
-                signed_pegin = sidechain.signrawtransaction(raw_pegin)
+                signed_pegin = sidechain.signrawtransactionwithwallet(raw_pegin)
                 assert(signed_pegin["complete"])
                 assert("warning" in signed_pegin) # warning for immature peg-in
                 # fully mature them now
