ARCHIVE/xahau.js
1
0
Fork 0
mirror of https://github.com/Xahau/xahau.js.git synced 2025-11-26 23:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Less slicing and dicing of tag_segment/indexes

Browse Source
This commit is contained in:
Nicholas Dudfield
2014-05-06 13:47:37 +07:00
parent a222f2be98
commit ea11d34254
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/js/ripple/shamap.js
View File

@@ -7,7 +7,7 @@ var UInt256 = require('./uint256').UInt256;
var SerializedObject = require('./serializedobject').SerializedObject; var SerializedObject = require('./serializedobject').SerializedObject;
function SHAMap() { function SHAMap() {
this.root = new SHAMapTreeNodeInner(); this.root = new SHAMapTreeNodeInner(0);
}; };
SHAMap.prototype.add_item = function (tag, node, type) { SHAMap.prototype.add_item = function (tag, node, type) {
@@ -50,45 +50,43 @@ function SHAMapTreeNodeInner(depth) {
this.leaves = {}; this.leaves = {};
this.type = SHAMapTreeNode.INNER; this.type = SHAMapTreeNode.INNER;
this.depth = depth == null ? 0 : depth;
// TODO
this.depth == depth == null ? 0 : depth;
this.empty = true; this.empty = true;
} }
util.inherits(SHAMapTreeNodeInner, SHAMapTreeNode); util.inherits(SHAMapTreeNodeInner, SHAMapTreeNode);
/*
* @param tag_segment {String} (equates to a ledger entries `index`)
*/
SHAMapTreeNodeInner.prototype.add_item = function (tag_segment, node) { SHAMapTreeNodeInner.prototype.add_item = function (tag_segment, node) {
var current_node = this.get_node(tag_segment[0]); var depth = this.depth;
var existing_node = this.get_node(tag_segment[depth]);
if (current_node) { if (existing_node) {
// A node already exists in this slot // A node already exists in this slot
if (existing_node instanceof SHAMapTreeNodeInner) {
if (current_node instanceof SHAMapTreeNodeInner) {
// There is an inner node, so we need to go deeper // There is an inner node, so we need to go deeper
current_node.add_item(tag_segment.slice(1), node); existing_node.add_item(tag_segment, node);
} else if (current_node.get_segment() === tag_segment) { } else if (existing_node.get_segment() === tag_segment) {
// Collision // Collision
throw new Error("Tried to add a node to a SHAMap that was already in there."); throw new Error("Tried to add a node to a SHAMap that was already in there.");
} else { } else {
// Turn it into an inner node // Turn it into an inner node
var new_inner_node = new SHAMapTreeNodeInner(); var new_inner_node = new SHAMapTreeNodeInner(depth + 1);
// Move the existing leaf node down one level // Parent new and existing node
current_node.set_segment(current_node.get_segment().slice(1)); new_inner_node.add_item(existing_node.get_segment(), existing_node);
new_inner_node.set_node(current_node.get_segment()[0], current_node); new_inner_node.add_item(tag_segment, node);
// Add the new node next to it
new_inner_node.add_item(tag_segment.slice(1), node);
// And place the newly created inner node in the slot // And place the newly created inner node in the slot
this.set_node(tag_segment[0], new_inner_node); this.set_node(tag_segment[depth], new_inner_node);
} }
} else { } else {
// Neat, we have a nice open spot for the new node // Neat, we have a nice open spot for the new node
node.set_segment(tag_segment); node.set_segment(tag_segment);
this.set_node(tag_segment[0], node); this.set_node(tag_segment[depth], node);
} }
}; };