Merge pull request #55 from fanatid/fix/alias

Fix property alias on initialization

.travis.yml

@@ -1,9 +1,9 @@
 language: node_js
 node_js:
-  - "0.11"
-  - "0.12"
   - "4"
   - "5"
+  - "6"
+  - "7"
 env:
   - CXX=g++-4.8
 addons:
@@ -18,14 +18,17 @@ env:
   global:
     - DISPLAY=:99.0
   matrix:
-    - CXX=g++-4.8 TEST_SUITE=test
+    - CXX=g++-4.8 TEST_SUITE=test:node
 matrix:
   fast_finish: true
   include:
     - os: linux
-      node_js: "4"
+      node_js: "6"
       env: CXX=g++-4.8 TEST_SUITE=coveralls
     - os: linux
-      node_js: "4"
+      node_js: "6"
       env: CXX=g++-4.8 TEST_SUITE=lint
+    - os: linux
+      node_js: "6"
+      env: CXX=g++-4.8 TEST_SUITE=test:browser
 script: npm run $TEST_SUITE

index.js

@@ -695,11 +695,11 @@ exports.defineProperties = function (self, fields, data) {
         self[self._fields[i]] = exports.toBuffer(d)
       })
     } else if (typeof data === 'object') {
-      for (var prop in data) {
-        if (self._fields.indexOf(prop) !== -1) {
-          self[prop] = data[prop]
-        }
-      }
+      const keys = Object.keys(data)
+      fields.forEach(function (field) {
+        if (keys.indexOf(field.name) !== -1) self[field.name] = data[field.name]
+        if (keys.indexOf(field.alias) !== -1) self[field.alias] = data[field.alias]
+      })
     } else {
       throw new Error('invalid data')
     }

package.json

@@ -45,12 +45,12 @@
     "karma": "^0.13.15",
     "karma-browserify": "^5.0.0",
     "karma-chrome-launcher": "^0.2.2",
-    "karma-detect-browsers": "^2.0.2",
+    "karma-detect-browsers": "2.0.2",
     "karma-env-preprocessor": "^0.1.1",
     "karma-firefox-launcher": "^0.1.7",
     "karma-mocha": "^0.2.1",
     "mocha": "^2.3.4",
-    "standard": "^5.4.1"
+    "standard": "*"
   },
   "standard": {
     "globals": [

test/defineFields.js

@@ -112,4 +112,13 @@ describe('define', function () {
     assert.equal(someOb.blah.toString(), 'lol')
     assert.equal(someOb.aword.toString(), 'lol')
   })
+
+  it('alias should work #2', function () {
+    var someOb = {}
+    var data = { blah: '42' }
+
+    ethUtil.defineProperties(someOb, fields, data)
+    assert.equal(someOb.blah, '42')
+    assert.equal(someOb.aword, '42')
+  })
 })