feat: switch back to using dryRun and util tests

src/commands/deploy/document-store.ts

@@ -34,7 +34,6 @@ export const handler = async (args: DeployDocumentStoreCommand): Promise<string
     );
     return documentStore.contractAddress;
   } catch (e) {
-    console.log(e);
     error(getErrorMessage(e));
   }
 };

src/commands/shared.ts

@@ -45,7 +45,7 @@ export type WalletOrSignerOption = Partial<PrivateKeyOption> | Partial<AwsKmsSig
 
 export interface GasOption {
   maxPriorityFeePerGasScale: number;
-  feeData: boolean;
+  dryRun: boolean;
 }
 
 export type NetworkAndWalletSignerOption = NetworkOption & (Partial<WalletOption> | Partial<PrivateKeyOption>);
@@ -66,8 +66,8 @@ export const withGasPriceOption = (yargs: Argv): Argv =>
       demandOption: false,
       description: "Scale for estimated priority fees (maxPriorityFeePerGasScale * estimatedPriorityFeePerGas)",
     })
-    .option("feeData", {
-      alias: "fee-data",
+    .option("dry-run", {
+      alias: "dr",
       type: "boolean",
       default: false,
       description: "Provide estimated MaxFeePerGas and PriorityFeePerGas",

src/implementations/config/helpers.ts

@@ -93,7 +93,7 @@ export const getTokenRegistryAddress = async (encryptedWalletPath: string): Prom
     maxPriorityFeePerGasScale: 1,
     registryName: "Token Registry",
     registrySymbol: "TR",
-    feeData: false,
+    dryRun: false,
   });
   const { contractAddress } = tokenRegistry;
   success(`Token registry deployed, address: ${highlight(contractAddress)}`);
@@ -105,7 +105,7 @@ export const getDocumentStoreAddress = async (encryptedWalletPath: string): Prom
   const documentStore = await deployDocumentStore({
     encryptedWalletPath,
     network: "goerli",
-    feeData: false,
+    dryRun: false,
     maxPriorityFeePerGasScale: 1,
     storeName: "Document Store",
   });

src/implementations/deploy/document-store/document-store.test.ts

@@ -11,7 +11,7 @@ const deployParams: DeployDocumentStoreCommand = {
   network: "goerli",
   key: "0000000000000000000000000000000000000000000000000000000000000001",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 describe("document-store", () => {
@@ -37,7 +37,7 @@ describe("document-store", () => {
       await deployDocumentStore({
         storeName: "Test",
         network: "goerli",
-        feeData: false,
+        dryRun: false,
         maxPriorityFeePerGasScale: 1,
       });
 
@@ -50,7 +50,7 @@ describe("document-store", () => {
         storeName: "Test",
         network: "goerli",
         keyFile: join(__dirname, "..", "..", "..", "..", "examples", "sample-key"),
-        feeData: false,
+        dryRun: false,
         maxPriorityFeePerGasScale: 1,
       });
 
@@ -80,7 +80,7 @@ describe("document-store", () => {
         deployDocumentStore({
           storeName: "Test",
           network: "goerli",
-          feeData: false,
+          dryRun: false,
           maxPriorityFeePerGasScale: 1,
         })
       ).rejects.toThrow(

src/implementations/deploy/document-store/document-store.ts

@@ -13,10 +13,10 @@ export const deployDocumentStore = async ({
   storeName,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: DeployDocumentStoreCommand): Promise<TransactionReceipt> => {
-  if (feeData) {
+  if (dryRun) {
     await dryRunMode({
       transaction: new DocumentStoreFactory().getDeployTransaction(storeName),
       network,

src/implementations/deploy/token-registry/token-registry.test.ts

@@ -10,7 +10,7 @@ const deployParams: DeployTokenRegistryCommand = {
   network: "goerli",
   key: "0000000000000000000000000000000000000000000000000000000000000001",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 describe("token-registry", () => {
@@ -81,7 +81,7 @@ describe("token-registry", () => {
           registrySymbol: "Tst",
           network: "goerli",
           maxPriorityFeePerGasScale: 1,
-          feeData: false,
+          dryRun: false,
         })
       ).rejects.toThrow(
         "No private key found in OA_PRIVATE_KEY, key, key-file, please supply at least one or supply an encrypted wallet path, or provide aws kms signer information"

src/implementations/deploy/token-registry/token-registry.ts

@@ -20,7 +20,7 @@ export const deployTokenRegistry = async ({
   deployerAddress,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: DeployTokenRegistryCommand): Promise<TransactionReceipt & { contractAddress: string }> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
@@ -45,7 +45,7 @@ export const deployTokenRegistry = async ({
     deployer: await wallet.getAddress(),
   });
 
-  if (feeData) {
+  if (dryRun) {
     const estimatedGas: BigNumber = await factory.estimateGas.deploy(
       deployContractAddress.tokenImplementation,
       initParam

src/implementations/document-store/issue.test.ts

@@ -12,7 +12,7 @@ const deployParams: DocumentStoreIssueCommand = {
   network: "goerli",
   key: "0000000000000000000000000000000000000000000000000000000000000001",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 // TODO the following test is very fragile and might break on every interface change of DocumentStoreFactory
@@ -53,7 +53,7 @@ describe("document-store", () => {
         address: "0x1234",
         network: "goerli",
         maxPriorityFeePerGasScale: 1,
-        feeData: false,
+        dryRun: false,
       });
 
       const passedSigner: Wallet = mockedConnect.mock.calls[0][1];

src/implementations/document-store/issue.ts

@@ -14,11 +14,11 @@ export const issueToDocumentStore = async ({
   hash,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: DocumentStoreIssueCommand): Promise<TransactionReceipt> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
-  if (feeData) {
+  if (dryRun) {
     const documentStore = await DocumentStoreFactory.connect(address, wallet);
     await dryRunMode({
       estimatedGas: await documentStore.estimateGas.issue(hash),

src/implementations/document-store/revoke.test.ts

@@ -13,7 +13,7 @@ const deployParams: DocumentStoreRevokeCommand = {
   network: "goerli",
   key: "0000000000000000000000000000000000000000000000000000000000000001",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 // TODO the following test is very fragile and might break on every interface change of DocumentStoreFactory

src/implementations/document-store/revoke.ts

@@ -13,11 +13,11 @@ export const revokeToDocumentStore = async ({
   hash,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: DocumentStoreRevokeCommand): Promise<{ transactionHash: string }> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
-  if (feeData) {
+  if (dryRun) {
     const documentStore = await DocumentStoreFactory.connect(address, wallet);
     await dryRunMode({
       estimatedGas: await documentStore.estimateGas.revoke(hash),

src/implementations/document-store/transfer-ownership.test.ts

@@ -13,7 +13,7 @@ const deployParams: DocumentStoreTransferOwnershipCommand = {
   network: "goerli",
   key: "0000000000000000000000000000000000000000000000000000000000000001",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 // TODO the following test is very fragile and might break on every interface change of DocumentStoreFactory

src/implementations/document-store/transfer-ownership.ts

@@ -14,11 +14,11 @@ export const transferDocumentStoreOwnershipToWallet = async ({
   newOwner,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: DocumentStoreTransferOwnershipCommand): Promise<TransactionReceipt> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
-  if (feeData) {
+  if (dryRun) {
     const documentStore = await DocumentStoreFactory.connect(address, wallet);
     await dryRunMode({
       estimatedGas: await documentStore.estimateGas.transferOwnership(newOwner),

src/implementations/title-escrow/acceptSurrendered.test.ts

@@ -11,7 +11,7 @@ const acceptSurrenderedDocumentParams: TitleEscrowSurrenderDocumentCommand = {
   tokenId: "0x12345",
   network: "goerli",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 describe("title-escrow", () => {

src/implementations/title-escrow/acceptSurrendered.ts

@@ -15,7 +15,7 @@ export const acceptSurrendered = async ({
   tokenId,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: TitleEscrowSurrenderDocumentCommand): Promise<TransactionReceipt> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
@@ -25,7 +25,7 @@ export const acceptSurrendered = async ({
     maxPriorityFeePerGas: scaleBigNumber(maxPriorityFeePerGas, maxPriorityFeePerGasScale),
     maxFeePerGas: calculateMaxFee(maxFeePerGas, maxPriorityFeePerGas, maxPriorityFeePerGasScale),
   });
-  if (feeData) {
+  if (dryRun) {
     await dryRunMode({
       estimatedGas: await tokenRegistryInstance.estimateGas.burn(tokenId),
       network,

src/implementations/title-escrow/endorseNominatedBeneficiary.test.ts

@@ -12,7 +12,7 @@ const endorseNominatedBeneficiaryParams: TitleEscrowNominateBeneficiaryCommand =
   newBeneficiary: "0x1232",
   network: "goerli",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 describe("title-escrow", () => {

src/implementations/title-escrow/endorseNominatedBeneficiary.ts

@@ -16,7 +16,7 @@ export const endorseNominatedBeneficiary = async ({
   newBeneficiary,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: TitleEscrowNominateBeneficiaryCommand): Promise<TransactionReceipt> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
@@ -28,7 +28,7 @@ export const endorseNominatedBeneficiary = async ({
     maxPriorityFeePerGas: scaleBigNumber(maxPriorityFeePerGas, maxPriorityFeePerGasScale),
     maxFeePerGas: calculateMaxFee(maxFeePerGas, maxPriorityFeePerGas, maxPriorityFeePerGasScale),
   });
-  if (feeData) {
+  if (dryRun) {
     await dryRunMode({
       estimatedGas: await titleEscrow.estimateGas.transferBeneficiary(nominatedBeneficiary),
       network,

src/implementations/title-escrow/nominateBeneficiary.test.ts

@@ -12,7 +12,7 @@ const nominateBeneficiaryParams: TitleEscrowNominateBeneficiaryCommand = {
   tokenRegistry: "0x1234",
   network: "goerli",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 describe("title-escrow", () => {

src/implementations/title-escrow/nominateBeneficiary.ts

@@ -16,7 +16,7 @@ export const nominateBeneficiary = async ({
   newBeneficiary,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: TitleEscrowNominateBeneficiaryCommand): Promise<TransactionReceipt> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
@@ -27,7 +27,7 @@ export const nominateBeneficiary = async ({
     maxPriorityFeePerGas: scaleBigNumber(maxPriorityFeePerGas, maxPriorityFeePerGasScale),
     maxFeePerGas: calculateMaxFee(maxFeePerGas, maxPriorityFeePerGas, maxPriorityFeePerGasScale),
   });
-  if (feeData) {
+  if (dryRun) {
     await validateNominateBeneficiary({ beneficiaryNominee: newBeneficiary, titleEscrow });
     await dryRunMode({
       estimatedGas: await titleEscrow.estimateGas.nominate(newBeneficiary),

src/implementations/title-escrow/rejectSurrendered.test.ts

@@ -11,7 +11,7 @@ const rejectSurrenderedDocumentParams: TitleEscrowSurrenderDocumentCommand = {
   tokenId: "0x12345",
   network: "goerli",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 describe("title-escrow", () => {

src/implementations/title-escrow/rejectSurrendered.ts

@@ -14,7 +14,7 @@ export const rejectSurrendered = async ({
   tokenId,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: TitleEscrowSurrenderDocumentCommand): Promise<TransactionReceipt> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
@@ -24,7 +24,7 @@ export const rejectSurrendered = async ({
     maxPriorityFeePerGas: scaleBigNumber(maxPriorityFeePerGas, maxPriorityFeePerGasScale),
     maxFeePerGas: calculateMaxFee(maxFeePerGas, maxPriorityFeePerGas, maxPriorityFeePerGasScale),
   });
-  if (feeData) {
+  if (dryRun) {
     await dryRunMode({
       estimatedGas: await tokenRegistryInstance.estimateGas.restore(tokenId),
       network,

src/implementations/title-escrow/surrenderDocument.test.ts

@@ -11,7 +11,7 @@ const surrenderDocumentParams: TitleEscrowSurrenderDocumentCommand = {
   tokenId: "0x12345",
   network: "goerli",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 describe("title-escrow", () => {

src/implementations/title-escrow/surrenderDocument.ts

@@ -14,7 +14,7 @@ export const surrenderDocument = async ({
   tokenId,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: TitleEscrowSurrenderDocumentCommand): Promise<TransactionReceipt> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
@@ -24,7 +24,7 @@ export const surrenderDocument = async ({
     maxPriorityFeePerGas: scaleBigNumber(maxPriorityFeePerGas, maxPriorityFeePerGasScale),
     maxFeePerGas: calculateMaxFee(maxFeePerGas, maxPriorityFeePerGas, maxPriorityFeePerGasScale),
   });
-  if (feeData) {
+  if (dryRun) {
     await dryRunMode({
       estimatedGas: await titleEscrow.estimateGas.surrender(),
       network,

src/implementations/title-escrow/transferHolder.test.ts

@@ -12,7 +12,7 @@ const transferHolderParams: TitleEscrowTransferHolderCommand = {
   tokenRegistry: "0x1234",
   network: "goerli",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 describe("title-escrow", () => {

src/implementations/title-escrow/transferHolder.ts

@@ -16,7 +16,7 @@ export const transferHolder = async ({
   tokenId,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: TitleEscrowTransferHolderCommand): Promise<TransactionReceipt> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
@@ -26,7 +26,7 @@ export const transferHolder = async ({
     maxPriorityFeePerGas: scaleBigNumber(maxPriorityFeePerGas, maxPriorityFeePerGasScale),
     maxFeePerGas: calculateMaxFee(maxFeePerGas, maxPriorityFeePerGas, maxPriorityFeePerGasScale),
   });
-  if (feeData) {
+  if (dryRun) {
     await dryRunMode({
       estimatedGas: await titleEscrow.estimateGas.transferHolder(to),
       network,

src/implementations/title-escrow/transferOwners.test.ts

@@ -13,7 +13,7 @@ const endorseChangeOwnersParams: TitleEscrowEndorseTransferOfOwnersCommand = {
   tokenRegistry: "0x1234",
   network: "goerli",
   maxPriorityFeePerGasScale: 1,
-  feeData: false,
+  dryRun: false,
 };
 
 describe("title-escrow", () => {

src/implementations/title-escrow/transferOwners.ts

@@ -17,7 +17,7 @@ export const transferOwners = async ({
   newOwner,
   network,
   maxPriorityFeePerGasScale,
-  feeData,
+  dryRun,
   ...rest
 }: TitleEscrowEndorseTransferOfOwnersCommand): Promise<TransactionReceipt> => {
   const wallet = await getWalletOrSigner({ network, ...rest });
@@ -28,7 +28,7 @@ export const transferOwners = async ({
     maxPriorityFeePerGas: scaleBigNumber(maxPriorityFeePerGas, maxPriorityFeePerGasScale),
     maxFeePerGas: calculateMaxFee(maxFeePerGas, maxPriorityFeePerGas, maxPriorityFeePerGasScale),
   });
-  if (feeData) {
+  if (dryRun) {
     await dryRunMode({
       estimatedGas: await titleEscrow.estimateGas.transferOwners(newOwner, newHolder),
       network,