diff --git a/app/models/ckey.js b/app/models/ckey.js deleted file mode 100644 index 2785869d061582a0cb359c6b2fe12e90de1fcd99..0000000000000000000000000000000000000000 --- a/app/models/ckey.js +++ /dev/null @@ -1,48 +0,0 @@ -var mongoose = require('mongoose'); -var async = require('async'); -var _ = require('underscore'); -var Schema = mongoose.Schema; -var logger = require('../../app/lib/logger')('key model'); - -var CKeySchema = new Schema({ - fingerprint: { type: String }, - operation: { type: String }, - algorithm: { type: String }, - member: { type: Boolean, default: false }, - count: { type: Number, default: 0 }, - created: { type: Date, default: Date.now }, - updated: { type: Date, default: Date.now } -}); - -CKeySchema.pre('save', function (next) { - this.updated = Date.now(); - next(); -}); - -CKeySchema.statics.increment = function(leaf, op, algo, isMember, done) { - var CKey = this; - async.waterfall([ - function (next){ - CKey.find({ fingerprint: leaf, operation: op, algorithm: algo, member: isMember }, next); - }, - function (ckeys, next){ - var ckey = ckeys[0] || new CKey({ - fingerprint: leaf, - operation: op, - algorithm: algo, - member: isMember, - count: 0 - }); - ckey.count++; - ckey.save(function (err) { - next(err, ckey); - }) - }, - ], done); -} - -CKeySchema.statics.findThose = function(op, algo, isMember, done) { - this.find({ operation: op, algorithm: algo, member: isMember }, done); -} - -module.exports = CKeySchema; diff --git a/server.js b/server.js index 69b030dbfd1a158a9c0966996982947335ac335c..136e9436a4b10836ed51cc67baf804e0a6aa10c5 100644 --- a/server.js +++ b/server.js @@ -168,7 +168,6 @@ function Server (dbConf, overrideConf, interceptors, onInit) { 'links', 'keys', 'keyblocks', - 'ckeys', 'merkles', 'peers', 'publickeys', diff --git a/test/medium/c-pubkeys.js b/test/medium/c-pubkeys.js index 2f6234a62eec887a6f90cac75595e72d72ce8b2b..e333c90e21c56d45eb556cd4e4689269032d787a 100644 --- a/test/medium/c-pubkeys.js +++ b/test/medium/c-pubkeys.js @@ -12,6 +12,8 @@ var test = require('./../tool/test'); var ucoin = require('./../..'); var logger = require('../../app/lib/logger')('test'); +require('log4js').configure({}); + var currency = "testo"; var tester = is = on = new test.tester(currency);