Cleanup OperationsLog

This commit is contained in:
haad 2016-04-27 09:21:04 +02:00
parent 44f648d34b
commit 01bdf1a80f

View File

@ -16,7 +16,8 @@ class OperationsLog {
get ops() { get ops() {
return this._log.items.map((f) => { return this._log.items.map((f) => {
Object.assign(f.payload, { hash: f.hash }); Object.assign(f.payload, { hash: f.hash });
if(f.payload.key === null) Object.assign(f.payload, { key: f.hash }); if(f.payload.key === null)
Object.assign(f.payload, { key: f.hash });
return f.payload; return f.payload;
}); });
} }
@ -41,15 +42,15 @@ class OperationsLog {
} }
}; };
let opHash, logHash;
return this._log.add(entry) return this._log.add(entry)
.then((op) => { .then((op) => opHash = op.hash)
return Log.getIpfsHash(this._ipfs, this._log).then((hash) => { .then(() => Log.getIpfsHash(this._ipfs, this._log))
this._lastWrite = hash; .then((hash) => logHash = hash)
Cache.set(this.dbname, hash); .then(() => this._lastWrite = logHash)
this.events.emit('data', this.dbname, hash); .then(() => Cache.set(this.dbname, logHash))
return op.hash; .then(() => this.events.emit('data', this.dbname, logHash))
}); .then(() => opHash)
});
} }
merge(hash) { merge(hash) {