Support Array and Uint8Array in "bytes" (as used by setcode) #6

EOSIO · Sep 23, 2018 · 259e50c · 259e50c
1 parent 58fb50b
commit 259e50c
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 139 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/index.js b/src/index.js
@@ -91,9 +91,9 @@ const fromBuffer = (types, structs) => (typeName, buf) => {
   return Fcbuffer.fromBuffer(type, buf)
 }
 
-const toBuffer = (types, structs) => (typeName, object) => {
+const toBuffer = (types, structs) => (typeName, value) => {
   assert.equal(typeof typeName, 'string', 'typeName (type or struct name)')
-  assert.equal(typeof object, 'object', 'object')
+  assert(value != null, 'value is required')
 
   let type = types[typeName]
   if(type) {
@@ -102,7 +102,7 @@ const toBuffer = (types, structs) => (typeName, object) => {
     type = structs[typeName]
   }
   assert(type, 'missing type or struct: ' + typeName)
-  return Fcbuffer.toBuffer(type, object)
+  return Fcbuffer.toBuffer(type, value)
 }
 
 module.exports.fromBuffer = Fcbuffer.fromBuffer

diff --git a/src/index.test.js b/src/index.test.js
@@ -12,6 +12,8 @@ describe('API', function () {
     const {bytes} = Types()
     const type = bytes()
     assertSerializer(type, '00aaeeff')
+    assertSerializer(type, Array.from([2, 1]), '020201', '0201')
+    assertSerializer(type, new Uint8Array([2, 1]), '020201', '0201')
     assertRequired(type)
   })
 
@@ -465,15 +467,15 @@ function assertCompile (definitions, config) {
   return structs
 }
 
-function assertSerializer (type, value, bufferHex) {
+function assertSerializer (type, value, bufferHex, internalValue = value) {
   const obj = type.fromObject(value) // tests fromObject
   const buf = Fcbuffer.toBuffer(type, obj) // tests appendByteBuffer
   if(bufferHex != null) {
     assert.equal(buf.toString('hex'), bufferHex)
   }
   const obj2 = Fcbuffer.fromBuffer(type, buf) // tests fromByteBuffer
   const obj3 = type.toObject(obj) // tests toObject
-  deepEqual(value, obj3, 'serialize object')
+  deepEqual(internalValue, obj3, 'serialize object')
   deepEqual(obj3, obj2, 'serialize buffer')
   return value
 }

diff --git a/src/types.js b/src/types.js
@@ -437,7 +437,13 @@ const bytebuf = (validation) => {
       b.append(value.toString('binary'), 'binary')
     },
     fromObject (value) {
-      if (typeof value === 'string') { value = Buffer.from(value, 'hex') }
+      if (typeof value === 'string') {
+        value = Buffer.from(value, 'hex')
+      } else if (value instanceof Array) {
+        value = Buffer.from(value)
+      } else if (value instanceof Uint8Array) {
+        value = Buffer.from(value)
+      }
 
       validate(value, validation)
       return value