Skip to content

Commit 2b75687

Browse files
committed
Merge branch 'master' into releases
2 parents 1131cdd + 386a6de commit 2b75687

File tree

2 files changed

+20
-12
lines changed

2 files changed

+20
-12
lines changed

gulpfile.js

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -228,33 +228,45 @@ gulp.task('release:bump', function() {
228228
});
229229

230230
gulp.task('release:checkout-releases', function(cb) {
231-
git.checkout('releases', {args: ''}, cb);
231+
git.checkout('releases', {
232+
args: ''
233+
}, cb);
232234
});
233235

234236
gulp.task('release:merge-master', function(cb) {
235-
git.merge('master', {args: ''}, cb);
237+
git.merge('master', {
238+
args: ''
239+
}, cb);
236240
});
237241

238242
gulp.task('release:checkout-master', function(cb) {
239-
git.checkout('master', {args: ''}, cb);
243+
git.checkout('master', {
244+
args: ''
245+
}, cb);
240246
});
241247

242248
gulp.task('release:add-built-files', function() {
243249
return gulp.src(['./browser/bitcore.js', './browser/bitcore.min.js', './package.json', './bower.json'])
244-
.pipe(git.add({args: '-f'}));
250+
.pipe(git.add({
251+
args: '-f'
252+
}));
245253
});
246254

247255
gulp.task('release:build-commit', ['release:add-built-files'], function() {
248256
var pjson = require('./package.json');
249257
return gulp.src(['./browser/bitcore.js', './browser/bitcore.min.js', './package.json', './bower.json'])
250-
.pipe(git.commit('Build: ' + pjson.version, {args: ''}));
258+
.pipe(git.commit('Build: ' + pjson.version, {
259+
args: ''
260+
}));
251261
});
252262

253263
gulp.task('release:version-commit', function() {
254264
var pjson = require('./package.json');
255265
var files = ['./package.json', './bower.json'];
256266
return gulp.src(files)
257-
.pipe(git.commit('Bump package version to ' + pjson.version, {args: ''}));
267+
.pipe(git.commit('Bump package version to ' + pjson.version, {
268+
args: ''
269+
}));
258270
});
259271

260272
gulp.task('release:push-releases', function(cb) {
@@ -273,9 +285,7 @@ gulp.task('release:push-tag', function(cb) {
273285
var pjson = require('./package.json');
274286
var name = 'v' + pjson.version;
275287
git.tag(name, 'Release ' + name, function() {
276-
git.push('bitpay', name, {
277-
args: '--tags'
278-
}, cb);
288+
git.push('bitpay', name, cb);
279289
});
280290
});
281291

lib/address.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ function Address(data, network, type) {
5858
return data;
5959
}
6060

61-
if (!data) {
62-
throw new TypeError('First argument is required, please include address data.');
63-
}
61+
$.checkArgument(data, new TypeError('First argument is required, please include address data.'));
6462

6563
if (network && !Networks.get(network)) {
6664
throw new TypeError('Second argument must be "livenet" or "testnet".');

0 commit comments

Comments
 (0)