From 65aad6d0ad4e8799e94d93cc846350955d3fbc48 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 4 Feb 2014 03:41:32 -0300
Subject: [PATCH] 02 transaction tests passing

---
 lib/TransactionDb.js                   | 27 +++++++++++++++++++++-----
 test/integration/02-transactionouts.js | 26 ++++++++-----------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/lib/TransactionDb.js b/lib/TransactionDb.js
index 918fe7a5..e76eeb34 100644
--- a/lib/TransactionDb.js
+++ b/lib/TransactionDb.js
@@ -71,6 +71,7 @@ function spec() {
     var k = OUTS_ROOT + txid;
     var ret=[];
 
+    // outs.
     self.db.createReadStream({start: k, end: k + '~'})
       .on('data', function (data) {
         var k = data.key.split('-');
@@ -84,8 +85,26 @@ function spec() {
       .on('error', function (err) {
         return cb(err);
       })
-      .on('end', function (err) {
-        return cb(err, ret);
+      .on('end', function () {
+        var k = SPEND_ROOT + txid;
+        var l = ret.length;
+        self.db.createReadStream({start: k, end: k + '~'})
+          .on('data', function (data) {
+            var k = data.key.split('-');
+            var v = data.value.split(':');
+            for(var i=0; i<l; i++) {
+              if (ret[i].index === k[3]) {
+                ret[i].spendTxId= v[0];
+                ret[i].spendIndex=v[1];
+              }
+            }
+          })
+          .on('error', function (err) {
+            return cb(err);
+          })
+          .on('end', function (err) {
+            return cb(err, ret);
+          });
       });
   };
 
@@ -194,8 +213,7 @@ function spec() {
 
     if (tx.hash) self.adaptTxObject(tx);
 
-    var ts = tx.timestamp;
-
+    var ts = tx.time;
 
     async.series([
       // Input Outpoints (mark them as spended)
@@ -302,7 +320,6 @@ function spec() {
       }
     },
     function(err) {
-console.log('[TransactionDb.js.308]'); //TODO
       return next(err, insertedTxs, updatedAddrs);
   });
 };
diff --git a/test/integration/02-transactionouts.js b/test/integration/02-transactionouts.js
index 8097f41c..84595b4f 100644
--- a/test/integration/02-transactionouts.js
+++ b/test/integration/02-transactionouts.js
@@ -5,31 +5,27 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
 
 
-var mongoose      = require('mongoose'),
+var 
   assert          = require('assert'),
   fs              = require('fs'),
   util            = require('util'),
   async           = require('async'),
   config          = require('../../config/config'),
-  TransactionOut = require('../../app/models/TransactionOut');
+  TransactionDb = require('../../lib/TransactionDb').class();
 
-var spentValid   = JSON.parse(fs.readFileSync('test/model/spent.json'));
+var spentValid   = JSON.parse(fs.readFileSync('test/integration/spent.json'));
 
-mongoose.connection.on('error', function(err) { console.log(err); });
-
-
-
-describe('TransactionOut Expenses', function(){
+describe('TransactionDb Expenses', function(){
+  var tdb = new TransactionDb();
 
   before(function(done) {
-    mongoose.connect(config.db);
 
     // lets spend!
     async.each(Object.keys(spentValid), 
       function(txid,c_out) {
         async.each(spentValid[txid], 
                   function(i,c_in) {
-                    TransactionOut._explodeTransactionOuts(i.txid, function(err) {
+                    tdb.createFromArray([i.txid], null, function(err) {
                       return c_in();
                     });
                   }, 
@@ -40,24 +36,18 @@ describe('TransactionOut Expenses', function(){
         );
       },
       function(err) {
-        console.log('[transactionouts.js.88]'); //TODO
         return done();
       }
     );
   });
 
-  after(function(done) {
-    mongoose.connection.close();
-    done();
-  });
-
   Object.keys(spentValid).forEach( function(txid) {
     it('test result of spending tx ' + txid, function(done) {
       var s = spentValid[txid];
       var c=0;
-      TransactionOut.fromTxId( txid, function(err, readItems) {
+      tdb.fromTxId( txid, function(err, readItems) {
         s.forEach( function(v) {
-          assert.equal(readItems[c].spendTxIdBuf.toString('hex'),v.txid);
+          assert.equal(readItems[c].spendTxId,v.txid);
           assert.equal(readItems[c].spendIndex,v.n);
           c++;
         });