From 9e4ea7519806e7cbb2cce08b701ed72ce9dce370 Mon Sep 17 00:00:00 2001
From: Christopher Jeffrey <chjjeffrey@gmail.com>
Date: Mon, 9 Jan 2017 14:25:45 -0800
Subject: [PATCH] test: cleanup.

---
 test/http-test.js    | 11 ++---------
 test/mempool-test.js | 30 +++++++++++-------------------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/test/http-test.js b/test/http-test.js
index 26f20975..b9664e12 100644
--- a/test/http-test.js
+++ b/test/http-test.js
@@ -6,19 +6,13 @@ var encoding = require('../lib/utils/encoding');
 var co = require('../lib/utils/co');
 var Amount = require('../lib/btc/amount');
 var Address = require('../lib/primitives/address');
+var Outpoint = require('../lib/primitives/outpoint');
 var MTX = require('../lib/primitives/mtx');
 var HTTP = require('../lib/http');
 var FullNode = require('../lib/node/fullnode');
 var USER_VERSION = require('../package.json').version;
 var cob = co.cob;
 
-var dummyInput = {
-  prevout: {
-    hash: encoding.NULL_HASH,
-    index: 0
-  }
-};
-
 describe('HTTP', function() {
   var node, wallet, addr, hash;
 
@@ -70,12 +64,11 @@ describe('HTTP', function() {
 
     // Coinbase
     tx = new MTX();
+    tx.addOutpoint(new Outpoint(encoding.NULL_HASH, 0));
     tx.addOutput(addr, 50460);
     tx.addOutput(addr, 50460);
     tx.addOutput(addr, 50460);
     tx.addOutput(addr, 50460);
-
-    tx.addInput(dummyInput);
     tx = tx.toTX();
 
     wallet.once('balance', function(b) {
diff --git a/test/mempool-test.js b/test/mempool-test.js
index ee50f6cd..23c949e0 100644
--- a/test/mempool-test.js
+++ b/test/mempool-test.js
@@ -12,6 +12,7 @@ var MTX = require('../lib/primitives/mtx');
 var Coin = require('../lib/primitives/coin');
 var KeyRing = require('../lib/primitives/keyring');
 var Address = require('../lib/primitives/address');
+var Outpoint = require('../lib/primitives/outpoint');
 var Script = require('../lib/script/script');
 var Witness = require('../lib/script/witness');
 var Block = require('../lib/primitives/block');
@@ -86,7 +87,7 @@ describe('Mempool', function() {
     t1.addOutput(w.getAddress(), 50000);
     t1.addOutput(w.getAddress(), 10000);
 
-    prev = new Script([kp.publicKey, opcodes.OP_CHECKSIG]);
+    prev = Script.fromPubkey(kp.publicKey);
     t1.addCoin(dummy(prev));
     sig = t1.signature(0, prev, 70000, kp.privateKey, Script.hashType.ALL, 0);
     t1.inputs[0].script = new Script([sig]);
@@ -185,7 +186,7 @@ describe('Mempool', function() {
     tx.addOutput(w.getAddress(), 50000);
     tx.addOutput(w.getAddress(), 10000);
 
-    prev = new Script([kp.publicKey, opcodes.OP_CHECKSIG]);
+    prev = Script.fromPubkey(kp.publicKey);
     prevHash = crypto.randomBytes(32).toString('hex');
 
     tx.addCoin(dummy(prev, prevHash));
@@ -194,7 +195,7 @@ describe('Mempool', function() {
     chain.tip.height = 200;
 
     sig = tx.signature(0, prev, 70000, kp.privateKey, Script.hashType.ALL, 0);
-    tx.inputs[0].script = new Script([sig]),
+    tx.inputs[0].script = new Script([sig]);
 
     tx = tx.toTX();
 
@@ -211,7 +212,7 @@ describe('Mempool', function() {
     tx.addOutput(w.getAddress(), 50000);
     tx.addOutput(w.getAddress(), 10000);
 
-    prev = new Script([kp.publicKey, opcodes.OP_CHECKSIG]);
+    prev = Script.fromPubkey(kp.publicKey);
     prevHash = crypto.randomBytes(32).toString('hex');
 
     tx.addCoin(dummy(prev, prevHash));
@@ -219,7 +220,7 @@ describe('Mempool', function() {
     chain.tip.height = 200 - 1;
 
     sig = tx.signature(0, prev, 70000, kp.privateKey, Script.hashType.ALL, 0);
-    tx.inputs[0].script = new Script([sig]),
+    tx.inputs[0].script = new Script([sig]);
     tx = tx.toTX();
 
     try {
@@ -244,7 +245,7 @@ describe('Mempool', function() {
     tx.addOutput(w.getAddress(), 50000);
     tx.addOutput(w.getAddress(), 10000);
 
-    prev = new Script([0, kp.getKeyHash()]);
+    prev = Script.fromProgram(0, kp.getKeyHash());
     prevHash = crypto.randomBytes(32).toString('hex');
 
     tx.addCoin(dummy(prev, prevHash));
@@ -276,7 +277,7 @@ describe('Mempool', function() {
     tx.addOutput(w.getAddress(), 50000);
     tx.addOutput(w.getAddress(), 10000);
 
-    prev = new Script([kp.publicKey, opcodes.OP_CHECKSIG]);
+    prev = Script.fromPubkey(kp.publicKey);
     prevHash = crypto.randomBytes(32).toString('hex');
 
     tx.addCoin(dummy(prev, prevHash));
@@ -307,7 +308,7 @@ describe('Mempool', function() {
     tx.addOutput(w.getAddress(), 50000);
     tx.addOutput(w.getAddress(), 10000);
 
-    prev = new Script([0, kp.getKeyHash()]);
+    prev = Script.fromProgram(0, kp.getKeyHash());
     prevHash = crypto.randomBytes(32).toString('hex');
 
     tx.addCoin(dummy(prev, prevHash));
@@ -334,7 +335,7 @@ describe('Mempool', function() {
     tx.addOutput(w.getAddress(), 50000);
     tx.addOutput(w.getAddress(), 10000);
 
-    prev = new Script([kp.publicKey, opcodes.OP_CHECKSIG]);
+    prev = Script.fromPubkey(kp.publicKey);
     prevHash = crypto.randomBytes(32).toString('hex');
 
     tx.addCoin(dummy(prev, prevHash));
@@ -358,17 +359,8 @@ describe('Mempool', function() {
     var tx, input;
 
     tx = new MTX();
+    tx.addOutpoint(new Outpoint());
     tx.addOutput(w.getAddress(), 50000);
-
-    input = {
-      prevout: {
-        hash: encoding.NULL_HASH,
-        index: 0xffffffff
-      }
-    };
-
-    tx.addInput(input);
-
     tx = tx.toTX();
 
     assert(mempool.hasReject(cached.hash()));