Skip to content
This repository has been archived by the owner on Jan 24, 2022. It is now read-only.

Remove repeated flag -f from push and set-admin #1123

Merged
merged 1 commit into from
Jul 18, 2019
Merged

Remove repeated flag -f from push and set-admin #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/cli/src/commands/push.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const register: (program: any) => any = program =>
.option('--skip-compile', 'skips contract compilation')
.option('-d, --deploy-dependencies', 'deploys dependencies to the network if there is no existing deployment')
.option('--reset', 'redeploys all contracts (not only the ones that changed)')
.option('-f, --force', 'ignores validation errors and deploys contracts')
.option('--force', 'ignores validation errors and deploys contracts')
.option(
'--deploy-proxy-admin',
"eagerly deploys the project's proxy admin (if not deployed yet on the provided network)",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/commands/set-admin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const register: (program: any) => any = program =>
.command(signature, undefined, { noHelp: true })
.usage('[alias-or-address] [new-admin-address] --network <network> [options]')
.description(description)
.option('-f, --force', 'bypass a manual check')
.option('--force', 'bypass a manual check')
.withNetworkOptions()
.withNonInteractiveOption()
.action(action);
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/commands/push.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe('push command', function() {
itShouldParse(
'should call push script with options',
'push',
'zos push --network test --skip-compile -d --reset -f --deploy-proxy-admin --deploy-proxy-factory',
'zos push --network test --skip-compile -d --reset --force --deploy-proxy-admin --deploy-proxy-factory',
function(push) {
push.should.have.been.calledWithExactly({
force: true,
Expand All @@ -39,7 +39,7 @@ describe('push command', function() {
itShouldParse(
'should call push script with options',
'push',
'zos push --network test --skip-compile -d --reset -f --deploy-proxy-admin --deploy-proxy-factory',
'zos push --network test --skip-compile -d --reset --force --deploy-proxy-admin --deploy-proxy-factory',
function(push) {
push.should.have.been.calledWithExactly({
force: true,
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/test/commands/setAdmin.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('set-admin command', function() {
itShouldParse(
'should call set-admin script with proxy address',
'setAdmin',
`zos set-admin 0x20 ${newAdmin} -f --network test`,
`zos set-admin 0x20 ${newAdmin} --force --network test`,
function(update) {
update.should.have.been.calledWith({
proxyAddress: '0x20',
Expand All @@ -25,7 +25,7 @@ describe('set-admin command', function() {
itShouldParse(
'should call set-admin script with network options',
'setAdmin',
`zos set-admin 0x20 ${newAdmin} -f --network test --from 0x40`,
`zos set-admin 0x20 ${newAdmin} --force --network test --from 0x40`,
function(update) {
update.should.have.been.calledWith({
proxyAddress: '0x20',
Expand All @@ -39,7 +39,7 @@ describe('set-admin command', function() {
itShouldParse(
'should call set-admin script with contract name',
'setAdmin',
`zos set-admin Impl ${newAdmin} -f --network test`,
`zos set-admin Impl ${newAdmin} --force --network test`,
function(update) {
update.should.have.been.calledWith({
contractAlias: 'Impl',
Expand All @@ -53,7 +53,7 @@ describe('set-admin command', function() {
itShouldParse(
'should call set-admin script with package name and contract name',
'setAdmin',
`zos set-admin OpenZeppelin/Impl ${newAdmin} -f --network test`,
`zos set-admin OpenZeppelin/Impl ${newAdmin} --force --network test`,
function(update) {
update.should.have.been.calledWith({
packageName: 'OpenZeppelin',
Expand All @@ -68,7 +68,7 @@ describe('set-admin command', function() {
itShouldParse(
'should call set-admin with new proxy admin owner address',
'setAdmin',
`zos set-admin ${newAdmin} -f --network test`,
`zos set-admin ${newAdmin} --force --network test`,
function(update) {
update.should.have.been.calledWith({
newAdmin: newAdmin,
Expand Down