changed deploy resolve

web3 · Sep 20, 2016 · ee6f298 · ee6f298
1 parent 721668d
commit ee6f298
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.versions b/.versions
@@ -1,3 +1,3 @@
-ethereum:[email protected]alpha
+ethereum:[email protected]beta
 [email protected]
 [email protected]
diff --git a/lib/web3/contract.js b/lib/web3/contract.js
@@ -391,7 +391,7 @@ Contract.prototype._checkForContractAddress = function(transactionHash, callback
                             callbackFired = true;
 
                             if(code.length > 2) {
-                                callback(null, receipt.contractAddress);
+                                callback(null, receipt);
                             } else {
                                 callback(new Error('The contract code couldn\'t be stored, please check your gas limit.'));
                             }
@@ -464,13 +464,13 @@ Contract.prototype.deploy = function(options, callback){
             defer.promise.emit('transactionHash', hash);
 
             // wait for the contract to be mined and return the address
-            _this._checkForContractAddress(hash, function(err, address){
+            _this._checkForContractAddress(hash, function(err, receipt){
                 if(err) {
                     defer.reject(err);
                     defer.promise.emit('error', err);
                 } else {
-                    defer.resolve(address);
-                    defer.promise.emit('mined', address, _this);
+                    defer.resolve(receipt);
+                    defer.promise.emit('mined', receipt);
                 }
 
                 // remove all listeners on the end, as no event will ever fire again

diff --git a/test/contract.js b/test/contract.js
@@ -676,7 +676,7 @@ describe('contract', function () {
                 assert.equal('0x5550000000000000000000000000000000000000000000000000000000000032', value);
             });
             deploy.on('mined', function (value) {
-                assert.equal(address, value);
+                assert.equal(address, value.contractAddress);
                 done();
             });
             // deploy.on('error', function (value) {