From 243f22381d092cafba88dac7331a624bf8ac2fc7 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Mon, 27 Jan 2014 13:10:59 -0300
Subject: [PATCH] update controllers to new virtual TX model

---
 app/controllers/transactions.js | 32 ++++----------------------------
 app/models/Block.js             |  5 +++--
 app/models/TransactionItem.js   |  5 ++++-
 lib/Sync.js                     |  4 ++--
 4 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/app/controllers/transactions.js b/app/controllers/transactions.js
index 61c4159..3154805 100644
--- a/app/controllers/transactions.js
+++ b/app/controllers/transactions.js
@@ -3,7 +3,7 @@
 /**
  * Module dependencies.
  */
-var Transaction = require('../models/Transaction');
+var Transaction = require('../models/Transaction').class();
 var Block       = require('../models/Block');
 var Address     = require('../models/Address');
 var async       = require('async');
@@ -139,32 +139,8 @@ exports.list = function(req, res, next) {
     });
   }
   else {
-    Transaction
-      .find()
-      .limit(limit)
-      .sort('-time')
-      .exec(function(err, txs) {
-        if (err) {
-          res.status(500).send(err);
-        } else {
-          var txids = [];
-          for(var i=0;i<txs.length;i++) {
-            txids.push(txs[i].txid);
-          }
-
-          async.mapSeries(txids, getTransaction, function(err, alltxs) {
-            if (err) {
-              console.log(err);
-              res.status(404).send('TX not found');
-            }
-
-            res.jsonp({
-              txs: alltxs,
-              length: alltxs.length
-            });
-          });
-        }
-      });
+    res.jsonp({
+      txs: [],
+    });
   }
-
 };
diff --git a/app/models/Block.js b/app/models/Block.js
index 33bf34b..8559b49 100644
--- a/app/models/Block.js
+++ b/app/models/Block.js
@@ -8,7 +8,8 @@ var mongoose    = require('mongoose'),
     RpcClient   = require('bitcore/RpcClient').class(),
     util        = require('bitcore/util/util'),
     BitcoreBlock= require('bitcore/Block').class(),
-    Transaction = require('./Transaction'),
+    Transaction = require('./Transaction').class(),
+    TransactionItem = require('./TransactionItem'),
     config      = require('../../config/config')
     ;
 
@@ -57,7 +58,7 @@ BlockSchema.statics.customCreate = function(block, cb) {
   newBlock.nextBlockHash = block.nextBlockHash;
 
 
-  Transaction.createFromArray(block.tx, newBlock.time, function(err, inserted_txs) {
+  TransactionItem.createFromArray(block.tx, function(err, inserted_txs) {
     if (err) return cb(err);
 
     newBlock.save(function(err) {
diff --git a/app/models/TransactionItem.js b/app/models/TransactionItem.js
index d56f8f4..c3b0f61 100644
--- a/app/models/TransactionItem.js
+++ b/app/models/TransactionItem.js
@@ -6,6 +6,7 @@
 var mongoose    = require('mongoose'),
     async       = require('async'),
     Transaction = require('./Transaction').class(),
+    sockets     = require('../controllers/socket.js'),
     Schema      = mongoose.Schema;
 
 var CONCURRENCY = 15;
@@ -154,13 +155,15 @@ TransactionItemSchema.statics.explodeTransactionItems = function(txid, cb) {
 
 
 TransactionItemSchema.statics.createFromArray = function(txs, next) {
+
+  var Self = this;
   if (!txs) return next();
 
   var inserted_txs = [];
 
   async.forEachLimit(txs, CONCURRENCY, function(txid, cb, was_new) {
 
-    TransactionItemSchema.explodeTransactionItems( txid, function(err, addrs) {
+    Self.explodeTransactionItems( txid, function(err, addrs) {
       if (err) return next(err);
       if (addrs) {
         async.each(addrs, function(addr){
diff --git a/lib/Sync.js b/lib/Sync.js
index 19e08ca..50d4b90 100644
--- a/lib/Sync.js
+++ b/lib/Sync.js
@@ -7,7 +7,7 @@ function spec() {
   var mongoose        = require('mongoose');
   var config          = require('../config/config');
   var Block           = require('../app/models/Block');
-  var Transaction     = require('../app/models/Transaction');
+  var TransactionItem = require('../app/models/TransactionItem');
   var sockets         = require('../app/controllers/socket.js');
   var async           = require('async');
 
@@ -94,7 +94,7 @@ function spec() {
   Sync.prototype.storeTxs = function(txs, cb) {
     var self = this;
 
-    Transaction.createFromArray(txs, function(err, inserted_txs) {
+    TransactionItem.createFromArray(txs, function(err, inserted_txs) {
       if (!err && inserted_txs && self.opts.broadcast_txs) {
 
         inserted_txs.forEach(function(tx) {