Merge pull request #7 from SIMBAChain/BLK-680_false_export_success_message

fixed incorrect export status bug

Author: bpbirch

build/main/commands/export.js

@@ -1,6 +1,6 @@
 {
     "name": "@simbachain/truffle",
-    "version": "3.1.6",
+    "version": "3.1.7",
     "description": "Truffle Plugin for SIMBAChain",
     "main": "build/main/index.js",
     "typings": "build/main/index.d.ts",
@@ -60,7 +60,7 @@
         "node": ">=10"
     },
     "dependencies": {
-        "@simbachain/web3-suites": "^2.1.4",
+        "@simbachain/web3-suites": "^2.1.5",
         "@truffle/config": "^1.2.33",
         "@types/configstore": "^4.0.0",
         "@types/crypto-js": "^3.1.44",
@@ -142,4 +142,4 @@
             "**/*.spec.js"
         ]
     }
-}
+}

package-lock.json

@@ -67,7 +67,7 @@ export const handler = async (args: yargs.Arguments): Promise<any> => {
     } else {
         interactive = true;
     }
-
+    
     const buildDir = SimbaConfig.buildDirectory;
     SimbaConfig.log.debug(`buildDir: ${buildDir}`);
     let files: string[] = [];
@@ -122,9 +122,11 @@ export const handler = async (args: yargs.Arguments): Promise<any> => {
     // use sourceCodeComparer to prevent export of contracts that
     // do not have any changes:
     const exportStatuses = await sourceCodeComparer.exportStatuses(choices);
+    const successfulExportMessage = `${chalk.greenBright(`Successfully exported`)}`;
 
     let currentContractName;
     if (!primary) {
+        const attemptedExports: Record<any, any> = {};
         let chosen: Record<string, Array<any>>;
         if (interactive) {
             chosen = await prompt({
@@ -156,18 +158,17 @@ export const handler = async (args: yargs.Arguments): Promise<any> => {
         const nonLibsArray = [];
         for (let i = 0; i < chosen.contracts.length; i++) {
             const contractName = chosen.contracts[i];
+            attemptedExports[contractName] = exportStatuses[contractName];
             if (supplementalInfo[contractName].contractType === "library") {
                 libsArray.push(contractName);
             } else {
                 nonLibsArray.push(contractName);
             }
         }
         const allContracts = libsArray.concat(nonLibsArray);
-        const attemptedExports: Record<any, any> = {};
         for (let i = 0; i < allContracts.length; i++) {
             const singleContractImportData = {} as any;
             currentContractName = allContracts[i];
-            attemptedExports[currentContractName] = exportStatuses[currentContractName];
             if (!exportStatuses[currentContractName].newOrChanged) {
                 continue;
             }
@@ -200,6 +201,7 @@ export const handler = async (args: yargs.Arguments): Promise<any> => {
                 }
 
                 if (resp.id) {
+                    attemptedExports[currentContractName].message = successfulExportMessage;
                     SimbaConfig.log.debug(`entering id exists logic`);
                     const contractType = supplementalInfo[currentContractName].contractType;
                     SimbaConfig.log.debug(`contractType: ${contractType}`);
@@ -214,8 +216,9 @@ export const handler = async (args: yargs.Arguments): Promise<any> => {
                         source_code: sourceCode,
                     }
                     SimbaConfig.ProjectConfigStore.set("contracts_info", contractsInfo);
-                    SimbaConfig.log.info(`${chalk.cyanBright(`\nsimba: Saved Contract ${chalk.greenBright(`${currentContractName}`)} to Design ID `)}${chalk.greenBright(`${resp.id}`)}`);
+                    SimbaConfig.log.info(`${chalk.cyanBright(`\nsimba: Successful Export! Saved Contract ${chalk.greenBright(`${currentContractName}`)} to Design ID `)}${chalk.greenBright(`${resp.id}`)}`);
                 } else {
+                    attemptedExports[currentContractName] = exportStatuses[currentContractName];
                     SimbaConfig.log.error(`${chalk.red('\nsimba: EXIT : Error exporting contract to SIMBA Chain')}`);
                     return;
                 }