added encoding test

baseTrie.js

@@ -31,9 +31,7 @@ function Trie (db, root) {
   Object.defineProperty(this, 'root', {
     set: function (value) {
       if (value) {
-        if (!Buffer.isBuffer(value) && typeof value === 'string') {
-          value = new Buffer(value, 'hex')
-        }
+        value = ethUtil.toBuffer(value)
         assert(value.length === 32, 'Invalid root length. Roots are 32 bytes')
       } else {
         value = self.EMPTY_TRIE_ROOT
@@ -57,6 +55,8 @@ function Trie (db, root) {
 Trie.prototype.get = function (key, cb) {
   var self = this
 
+  key = ethUtil.toBuffer(key)
+
   self._findPath(key, function (err, node, remainder, stack) {
     var value = null
     if (node && remainder.length === 0) {
@@ -76,6 +76,9 @@ Trie.prototype.get = function (key, cb) {
 Trie.prototype.put = function (key, value, cb) {
   var self = this
 
+  key = ethUtil.toBuffer(key)
+  value = ethUtil.toBuffer(value)
+
   if (!value || value.toString() === '') {
     self.del(key, cb)
   } else {
@@ -101,6 +104,8 @@ Trie.prototype.put = function (key, value, cb) {
 // deletes a value
 Trie.prototype.del = function (key, cb) {
   var self = this
+
+  key = ethUtil.toBuffer(key)
   cb = callTogether(cb, self.sem.leave)
 
   self.sem.take(function () {
@@ -123,6 +128,8 @@ Trie.prototype.del = function (key, cb) {
  * @param {Buffer} key
  */
 Trie.prototype.getRaw = function (key, cb) {
+  key = ethUtil.toBuffer(key)
+
   function dbGet (db, cb2) {
     db.get(key, {
       keyEncoding: 'binary',
@@ -683,6 +690,7 @@ Trie.prototype.batch = function (ops, cb) {
  * @param {Function} cb
  */
 Trie.prototype.checkRoot = function (root, cb) {
+  root = ethUtil.toBuffer(root)
   this._lookupNode(root, function (err, value) {
     cb(err, !!value)
   })

test/encodeing.js

@@ -0,0 +1,16 @@
+var Trie = require('../index.js')
+var assert = require('assert')
+var trie = new Trie()
+var trie2 = new Trie()
+
+var hex = 'FF44A3B3'
+describe('encoding', function () {
+  it('hexprefixes ', function (done) {
+    trie.put(new Buffer(hex, 'hex'), 'test', function () {
+      trie2.put('0x' + hex, 'test', function () {
+        assert.equal(trie.root.toString('hex'), trie2.root.toString('hex'))
+        done()
+      })
+    })
+  })
+})

trieNode.js

@@ -87,7 +87,7 @@ TrieNode.prototype.getValue = function (key) {
 
 TrieNode.prototype.setKey = function (key) {
   if (this.type !== 'branch') {
-    if (Buffer.isBuffer(key) || typeof key === 'string') {
+    if (Buffer.isBuffer(key)) {
       key = stringToNibbles(key)
     } else {
       key = key.slice(0) // copy the key
@@ -238,9 +238,7 @@ function nibblesToBuffer (arr) {
  * - unknown - if somehting fucked up
  */
 function getNodeType (node) {
-  if (Buffer.isBuffer(node) || typeof node === 'string' || node instanceof String) {
-    return 'unknown'
-  } else if (node.length === 17) {
+  if (node.length === 17) {
     return 'branch'
   } else if (node.length === 2) {
     var key = stringToNibbles(node[0])