fix cmd outputs #33

Merged
0xmuralik merged 6 commits from murali/output into main 2023-03-28 12:30:56 +00:00
26 changed files with 136 additions and 25 deletions
Showing only changes of commit 8ebb80beed - Show all commits

View File

@ -24,5 +24,9 @@ export const handler = async (argv: Arguments) => {
const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
const result = await registry.getAccounts([address]); const result = await registry.getAccounts([address]);
console.log(JSON.stringify(result, undefined, 2)); if (argv.output=="json"){
console.log(JSON.stringify(result, undefined, 2));
} else {
console.log(result)
}
} }

View File

@ -45,4 +45,10 @@ export const handler = async (argv: Arguments) => {
const result = await registry.commitBid({ auctionId, commitHash }, privateKey, fee); const result = await registry.commitBid({ auctionId, commitHash }, privateKey, fee);
const revealFile = `{"reveal_file":"${revealFilePath}"}` const revealFile = `{"reveal_file":"${revealFilePath}"}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2)+ JSON.stringify(JSON.parse(revealFile)) : JSON.stringify(JSON.parse(revealFile))); console.log(argv.verbose ? JSON.stringify(result, undefined, 2)+ JSON.stringify(JSON.parse(revealFile)) : JSON.stringify(JSON.parse(revealFile)));
if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2)+"\n"+JSON.stringify(JSON.parse(revealFile)) : JSON.stringify(JSON.parse(revealFile)));
} else {
console.log(argv.verbose ? result+"\n"+revealFile:revealFile)
}
} }

View File

@ -29,5 +29,10 @@ export const handler = async (argv: Arguments) => {
const reveal = fs.readFileSync(path.resolve(filePath)); const reveal = fs.readFileSync(path.resolve(filePath));
const result = await registry.revealBid({ auctionId, reveal: reveal.toString('hex') }, privateKey, fee); const result = await registry.revealBid({ auctionId, reveal: reveal.toString('hex') }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success)));
if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -21,5 +21,9 @@ export const handler = async (argv: Arguments) => {
const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
const result = await registry.getAuctionsByIds([id as string]); const result = await registry.getAuctionsByIds([id as string]);
console.log(JSON.stringify(result, undefined, 2)); if (argv.output=="json"){
console.log(JSON.stringify(result, undefined, 2));
} else {
console.log(result)
}
} }

View File

@ -25,5 +25,9 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig); const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.setAuthorityBond({ name, bondId }, privateKey, fee); const result = await registry.setAuthorityBond({ name, bondId }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -32,5 +32,9 @@ export const handler = async (argv: Arguments) => {
const result = await registry.reserveAuthority({ name, owner }, privateKey, fee); const result = await registry.reserveAuthority({ name, owner }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -21,5 +21,9 @@ export const handler = async (argv: Arguments) => {
const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
const result = await registry.lookupAuthorities([name], true); const result = await registry.lookupAuthorities([name], true);
console.log(JSON.stringify(result, undefined, 2)); if (argv.output=="json"){
console.log(JSON.stringify(result, undefined, 2));
} else {
console.log(result)
}
} }

View File

@ -31,5 +31,9 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig); const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.associateBond({ recordId: id, bondId }, privateKey, fee); const result = await registry.associateBond({ recordId: id, bondId }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -23,5 +23,9 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig); const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.cancelBond({ id }, privateKey, fee); const result = await registry.cancelBond({ id }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -37,5 +37,10 @@ export const handler = async (argv: Arguments) => {
const bondId = await registry.getNextBondId(privateKey); const bondId = await registry.getNextBondId(privateKey);
const result = await registry.createBond({ denom, amount }, privateKey, fee); const result = await registry.createBond({ denom, amount }, privateKey, fee);
const jsonString=`{"bondId":"${bondId}"}` const jsonString=`{"bondId":"${bondId}"}`
console.log(verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(jsonString),null,2));
if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(jsonString)));
} else {
console.log(argv.verbose ? result : jsonString);
}
} }

View File

@ -23,5 +23,9 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig); const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.dissociateBond({ recordId: id }, privateKey, fee); const result = await registry.dissociateBond({ recordId: id }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -21,5 +21,10 @@ export const handler = async (argv: Arguments) => {
const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
const result = await registry.getBondsByIds([id as string]); const result = await registry.getBondsByIds([id as string]);
console.log(JSON.stringify(result, undefined, 2));
if (argv.output=="json"){
console.log(JSON.stringify(result, undefined, 2));
} else {
console.log(result)
}
} }

View File

@ -25,5 +25,10 @@ export const handler = async (argv: Arguments) => {
const { owner } = argv; const { owner } = argv;
const result = await registry.queryBonds({ owner }); const result = await registry.queryBonds({ owner });
console.log(JSON.stringify(result, undefined, 2));
if (argv.output=="json"){
console.log(JSON.stringify(result, undefined, 2));
} else {
console.log(result)
}
} }

View File

@ -29,5 +29,9 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig); const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.dissociateRecords({ bondId }, privateKey, fee); const result = await registry.dissociateRecords({ bondId }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -34,5 +34,9 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig); const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.reassociateRecords({ oldBondId, newBondId }, privateKey, fee); const result = await registry.reassociateRecords({ oldBondId, newBondId }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -38,5 +38,9 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig); const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.refillBond({ id, denom, amount }, privateKey, fee); const result = await registry.refillBond({ id, denom, amount }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -37,5 +37,9 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig); const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.withdrawBond({ id, denom, amount }, privateKey, fee); const result = await registry.withdrawBond({ id, denom, amount }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -24,5 +24,9 @@ export const handler = async (argv: Arguments) => {
const result = await registry.deleteName({ crn: name }, privateKey, fee); const result = await registry.deleteName({ crn: name }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -27,5 +27,9 @@ export const handler = async (argv: Arguments) => {
const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
const result = await registry.lookupNames([name], argv.history as boolean); const result = await registry.lookupNames([name], argv.history as boolean);
console.log(JSON.stringify(result, undefined, 2)); if (argv.output=="json"){
console.log(JSON.stringify(result, undefined, 2));
} else {
console.log(result)
}
} }

View File

@ -22,5 +22,9 @@ export const handler = async (argv: Arguments) => {
const result = await registry.resolveNames([name]); const result = await registry.resolveNames([name]);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -26,5 +26,9 @@ export const handler = async (argv: Arguments) => {
const result = await registry.setName({ crn: name, cid: id }, privateKey, fee); const result = await registry.setName({ crn: name, cid: id }, privateKey, fee);
const success = `{"success":${result.code==0}}` const success = `{"success":${result.code==0}}`
console.log(argv.verbose ? JSON.stringify(result, undefined, 2): JSON.stringify(JSON.parse(success))); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(JSON.parse(success)));
} else {
console.log(argv.verbose ? result : success);
}
} }

View File

@ -21,5 +21,9 @@ export const handler = async (argv: Arguments) => {
const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
const result = await registry.getRecordsByIds([id as string]); const result = await registry.getRecordsByIds([id as string]);
console.log(JSON.stringify(result, undefined, 2)); if (argv.output=="json"){
console.log(JSON.stringify(result, undefined, 2));
} else {
console.log(result)
}
} }

View File

@ -36,5 +36,9 @@ export const handler = async (argv: Arguments) => {
const registry = new Registry(gqlEndpoint, restEndpoint, chainId); const registry = new Registry(gqlEndpoint, restEndpoint, chainId);
const result = await registry.queryRecords({ bondId, type, name }, all as boolean); const result = await registry.queryRecords({ bondId, type, name }, all as boolean);
console.log(JSON.stringify(result, undefined, 2)); if (argv.output=="json"){
console.log(JSON.stringify(result, undefined, 2));
} else {
console.log(result)
}
} }

View File

@ -40,5 +40,9 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig); const fee = getGasAndFees(argv, cnsConfig);
const result = await registry.setRecord({ privateKey: userKey, record, bondId }, txKey as string, fee); const result = await registry.setRecord({ privateKey: userKey, record, bondId }, txKey as string, fee);
console.log(verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(result.data,undefined,2)); if (argv.output=="json"){
console.log(argv.verbose ? JSON.stringify(result, undefined, 2) : JSON.stringify(result.data,undefined,2));
} else {
console.log(argv.verbose ? result : result.data);
}
} }

View File

@ -40,5 +40,9 @@ export const handler = async (argv: Arguments) => {
const fee = getGasAndFees(argv, cnsConfig); const fee = getGasAndFees(argv, cnsConfig);
await registry.sendCoins({ denom, amount, destinationAddress }, privateKey, fee); await registry.sendCoins({ denom, amount, destinationAddress }, privateKey, fee);
const result = await registry.getAccounts([fromAddress, destinationAddress]); const result = await registry.getAccounts([fromAddress, destinationAddress]);
console.log(JSON.stringify(result, undefined, 2)); if (argv.output=="json"){
console.log(JSON.stringify(result, undefined, 2));
} else {
console.log(result)
}
} }

View File

@ -15,6 +15,11 @@ yargs(hideBin(process.argv))
default: 'config.yml', default: 'config.yml',
describe: 'Config file path.', describe: 'Config file path.',
type: 'string' type: 'string'
},
output: {
alias: 'o',
describe: 'Gives output in json format when specified.',
type: 'string'
} }
}) })
.commandDir('cmds') .commandDir('cmds')