Merge pull request #3015 from micahriggan/fix/web3-contract-event-name

Fix accessing event.name where event is undefined

.travis.yml

@@ -1,3 +1,5 @@
+services:
+    - xvfb
 language: node_js
 node_js:
     - "8"
@@ -12,10 +14,7 @@ addons:
     - ubuntu-toolchain-r-test
     packages:
     - g++-4.8
-before_script:
-    - export DISPLAY=:99.0
-    - sh -e /etc/init.d/xvfb start
-install:
+    install:
     - npm install
 script:
     - npm run-script build

packages/web3-eth-contract/src/index.js

@@ -528,16 +528,16 @@ Contract.prototype._generateEventOptions = function() {
     // get the options
     var options = (_.isObject(args[args.length - 1])) ? args.pop() : {};
 
-    var event = (_.isString(args[0])) ? args[0] : 'allevents';
-    event = (event.toLowerCase() === 'allevents') ? {
+    var eventName = (_.isString(args[0])) ? args[0] : 'allevents';
+    var event = (eventName.toLowerCase() === 'allevents') ? {
             name: 'ALLEVENTS',
             jsonInterface: this.options.jsonInterface
         } : this.options.jsonInterface.find(function (json) {
-            return (json.type === 'event' && (json.name === event || json.signature === '0x'+ event.replace('0x','')));
+            return (json.type === 'event' && (json.name === eventName || json.signature === '0x'+ eventName.replace('0x','')));
         });
 
     if (!event) {
-        throw new Error('Event "' + event.name + '" doesn\'t exist in this contract.');
+        throw new Error('Event "' + eventName + '" doesn\'t exist in this contract.');
     }
 
     if (!utils.isAddress(this.options.address)) {