From c06c81e27b06fb9bc08168e81c8dd691b5c939c3 Mon Sep 17 00:00:00 2001
From: Manuel Araoz <manuelaraoz@gmail.com>
Date: Thu, 20 Nov 2014 18:19:48 -0300
Subject: [PATCH] fixing tests

---
 Gruntfile.js  |  2 +-
 test/bip32.js |  9 ++++++---
 test/block.js | 28 ++++++++++++++--------------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index adc5e75..a8e344a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -17,7 +17,7 @@ module.exports = function(grunt) {
           stderr: true
         },
         command: grunt.option('target') === 'dev' ?
-            'node ./browser/build.js -a -d; docco lib/* ' : 'node ./browser/build.js -a'
+            './browser/build; docco lib/* ' : './browser/build'
       }
     },
     watch: {
diff --git a/test/bip32.js b/test/bip32.js
index a843c48..3464338 100644
--- a/test/bip32.js
+++ b/test/bip32.js
@@ -1,12 +1,15 @@
+'use strict';
+
 var should = require('chai').should();
-var constants = require('../lib/constants');
-var BIP32 = require('../lib/bip32');
+var bitcore = require('..');
+var constants = bitcore.constants;
+var BIP32 = bitcore.BIP32;
 
 describe('BIP32', function() {
 
   //test vectors: https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki
   var vector1_master = '000102030405060708090a0b0c0d0e0f';
-  var vector1_m_public = 'xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8'
+  var vector1_m_public = 'xpub661MyMwAqRbcFtXgS5sYJABqqG9YLmC4Q1Rdap9gSE8NqtwybGhePY2gZ29ESFjqJoCu1Rupje8YtGqsefD265TMg7usUDFdp6W1EGMcet8';
   var vector1_m_private = 'xprv9s21ZrQH143K3QTDL4LXw2F7HEK3wJUD2nW2nRk4stbPy6cq3jPPqjiChkVvvNKmPGJxWUtg6LnF5kejMRNNU3TGtRBeJgk33yuGBxrMPHi';
   var vector1_m0h_public = 'xpub68Gmy5EdvgibQVfPdqkBBCHxA5htiqg55crXYuXoQRKfDBFA1WEjWgP6LHhwBZeNK1VTsfTFUHCdrfp1bgwQ9xv5ski8PX9rL2dZXvgGDnw';
   var vector1_m0h_private = 'xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7';
diff --git a/test/block.js b/test/block.js
index 85de6e9..6daeccf 100644
--- a/test/block.js
+++ b/test/block.js
@@ -1,25 +1,25 @@
-var Blockheader = require('../lib/blockheader');
-var Block = require('../lib/block');
-var BufferWriter = require('../lib/bufferwriter');
-var BufferReader = require('../lib/bufferreader');
-var Varint = require('../lib/varint');
+'use strict';
+
 var should = require('chai').should();
-var Transaction = require('../lib/transaction');
+var bitcore = require('..');
+var Blockheader = bitcore.Blockheader;
+var Block = bitcore.Block;
+var BufferReader = bitcore.BufferReader;
+var Varint = bitcore.Varint;
+var Transaction = bitcore.Transaction;
 
 describe('Block', function() {
   
-  var txidhex = '8c9aa966d35bfeaf031409e0001b90ccdafd8d859799eb945a3c515b8260bcf2';
   var txhex = '01000000029e8d016a7b0dc49a325922d05da1f916d1e4d4f0cb840c9727f3d22ce8d1363f000000008c493046022100e9318720bee5425378b4763b0427158b1051eec8b08442ce3fbfbf7b30202a44022100d4172239ebd701dae2fbaaccd9f038e7ca166707333427e3fb2a2865b19a7f27014104510c67f46d2cbb29476d1f0b794be4cb549ea59ab9cc1e731969a7bf5be95f7ad5e7f904e5ccf50a9dc1714df00fbeb794aa27aaff33260c1032d931a75c56f2ffffffffa3195e7a1ab665473ff717814f6881485dc8759bebe97e31c301ffe7933a656f020000008b48304502201c282f35f3e02a1f32d2089265ad4b561f07ea3c288169dedcf2f785e6065efa022100e8db18aadacb382eed13ee04708f00ba0a9c40e3b21cf91da8859d0f7d99e0c50141042b409e1ebbb43875be5edde9c452c82c01e3903d38fa4fd89f3887a52cb8aea9dc8aec7e2c9d5b3609c03eb16259a2537135a1bf0f9c5fbbcbdbaf83ba402442ffffffff02206b1000000000001976a91420bb5c3bfaef0231dc05190e7f1c8e22e098991e88acf0ca0100000000001976a9149e3e2d23973a04ec1b02be97c30ab9f2f27c3b2c88ac00000000';
   var txbuf = new Buffer(txhex, 'hex');
-  var tx = Transaction().fromBuffer(txbuf);
   var magicnum = 0xd9b4bef9;
   var blocksize = 50;
-  bhhex = '0100000005050505050505050505050505050505050505050505050505050505050505050909090909090909090909090909090909090909090909090909090909090909020000000300000004000000';
-  bhbuf = new Buffer(bhhex, 'hex');
-  var bh = Blockheader().fromBuffer(bhbuf);
-  var txsvi = Varint(1);
-  var txs = [Transaction().fromBuffer(txbuf)];
-  var block = Block().set({
+  var bhhex = '0100000005050505050505050505050505050505050505050505050505050505050505050909090909090909090909090909090909090909090909090909090909090909020000000300000004000000';
+  var bhbuf = new Buffer(bhhex, 'hex');
+  var bh = new Blockheader().fromBuffer(bhbuf);
+  var txsvi = new Varint(1);
+  var txs = [new Transaction().fromBuffer(txbuf)];
+  var block = new Block().set({
     magicnum: magicnum,
     blocksize: blocksize,
     blockheader: bh,