task: remove cmc plugin and move cmcRoutes into mosaic:supplyRoutes

catapult-sdk/src/plugins/catapultModelSystem.js

@@ -22,7 +22,6 @@
 /** @module plugins/catapultModelSystem */
 const accountLink = require('./accountLink');
 const aggregate = require('./aggregate');
-const cmc = require('./cmc');
 const lockHash = require('./lockHash');
 const lockSecret = require('./lockSecret');
 const metadata = require('./metadata');
@@ -47,8 +46,7 @@ const plugins = {
 	namespace,
 	receipts,
 	restrictions,
-	transfer,
-	cmc
+	transfer
 };
 
 /**

catapult-sdk/test/plugins/catapultModelSystem_spec.js

@@ -56,8 +56,7 @@ describe('catapult model system', () => {
 				'namespace',
 				'receipts',
 				'restrictions',
-				'transfer',
-				'cmc'
+				'transfer'
 			]);
 		});
 	});

rest/src/plugins/mosaic/mosaic.js

@@ -22,6 +22,7 @@
 /** @module plugins/mosaic */
 const MosaicDb = require('./MosaicDb');
 const mosaicRoutes = require('./mosaicRoutes');
+const supplyRoutes = require('./supplyRoutes');
 
 /**
  * Creates a mosaic plugin.
@@ -36,5 +37,6 @@ module.exports = {
 
 	registerRoutes: (...args) => {
 		mosaicRoutes.register(...args);
+		supplyRoutes.register(...args);
 	}
 };

rest/src/plugins/cmc/cmcRoutes.js → rest/src/plugins/mosaic/supplyRoutes.js

@@ -19,7 +19,6 @@
  * along with Catapult.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-const cmcUtils = require('./cmcUtils');
 const { longToUint64 } = require('../../db/dbUtils');
 const routeUtils = require('../../routes/routeUtils');
 const AccountType = require('../AccountType');
@@ -32,7 +31,9 @@ const { convert, uint64 } = catapult.utils;
 
 module.exports = {
 	register: (server, db, services) => {
-		const sender = routeUtils.createSender('cmc');
+		const sender = routeUtils.createSender('supply');
+
+		const convertToFractionalWholeUnits = (value, divisibility) => (Number(value) / (10 ** divisibility)).toFixed(divisibility);
 
 		const propertyValueToMosaicId = value => uint64.fromHex(value.replace(/'/g, '').replace('0x', ''));
 
@@ -42,6 +43,14 @@ module.exports = {
 				.then(fileData => ini.parse(fileData));
 		};
 
+		const getMosaicProperties = async currencyMosaicId => {
+			const mosaics = await db.mosaicsByIds([currencyMosaicId]);
+			return {
+				totalSupply: mosaics[0].mosaic.supply.toNumber(),
+				divisibility: mosaics[0].mosaic.divisibility
+			};
+		};
+
 		const getUncirculatingAccountIds = propertiesObject => {
 			const publicKeys = [propertiesObject.network.nemesisSignerPublicKey].concat(services.config.uncirculatingAccountPublicKeys);
 			return publicKeys.map(publicKey => ({ [AccountType.publicKey]: convert.hexToUint8(publicKey) }));
@@ -59,30 +68,37 @@ module.exports = {
 		server.get('/network/currency/supply/circulating', (req, res, next) => readAndParseNetworkPropertiesFile()
 			.then(async propertiesObject => {
 				const currencyMosaicId = propertyValueToMosaicId(propertiesObject.chain.currencyMosaicId);
-				const mosaics = await db.mosaicsByIds([currencyMosaicId]);
-				const accounts = await db.catapultDb.accountsByIds(getUncirculatingAccountIds(propertiesObject));
+				const currencyMosaicProperties = await getMosaicProperties(currencyMosaicId);
 
-				const totalSupply = mosaics[0].mosaic.supply.toNumber();
+				const accounts = await db.catapultDb.accountsByIds(getUncirculatingAccountIds(propertiesObject));
 				const burnedSupply = accounts.reduce(
 					(sum, account) => sum + lookupMosaicAmount(account.account.mosaics, currencyMosaicId),
 					0
 				);
-				sender.sendPlainText(res, next)(cmcUtils.convertToRelative(totalSupply - burnedSupply));
+
+				sender.sendPlainText(res, next)(convertToFractionalWholeUnits(
+					currencyMosaicProperties.totalSupply - burnedSupply,
+					currencyMosaicProperties.divisibility
+				));
 			}));
 
 		server.get('/network/currency/supply/total', (req, res, next) => readAndParseNetworkPropertiesFile()
-			.then(propertiesObject => {
+			.then(async propertiesObject => {
 				const currencyMosaicId = propertyValueToMosaicId(propertiesObject.chain.currencyMosaicId);
-				return db.mosaicsByIds([currencyMosaicId]).then(response => {
-					const supply = response[0].mosaic.supply.toNumber();
-					sender.sendPlainText(res, next)(cmcUtils.convertToRelative(supply));
-				});
+				const currencyMosaicProperties = await getMosaicProperties(currencyMosaicId);
+				sender.sendPlainText(res, next)(convertToFractionalWholeUnits(
+					currencyMosaicProperties.totalSupply,
+					currencyMosaicProperties.divisibility
+				));
 			}));
 
 		server.get('/network/currency/supply/max', (req, res, next) => readAndParseNetworkPropertiesFile()
-			.then(propertiesObject => {
-				const supply = parseInt(propertiesObject.chain.maxMosaicAtomicUnits.replace(/'/g, ''), 10);
-				sender.sendPlainText(res, next)(cmcUtils.convertToRelative(supply));
+			.then(async propertiesObject => {
+				const currencyMosaicId = propertyValueToMosaicId(propertiesObject.chain.currencyMosaicId);
+				const currencyMosaicProperties = await getMosaicProperties(currencyMosaicId);
+
+				const maxSupply = parseInt(propertiesObject.chain.maxMosaicAtomicUnits.replace(/'/g, ''), 10);
+				sender.sendPlainText(res, next)(convertToFractionalWholeUnits(maxSupply, currencyMosaicProperties.divisibility));
 			}));
 	}
 };

rest/src/plugins/routeSystem.js

@@ -20,7 +20,6 @@
  */
 
 const aggregate = require('./aggregate/aggregate');
-const cmc = require('./cmc/cmc');
 const empty = require('./empty');
 const lockHash = require('./lockHash/lockHash');
 const lockSecret = require('./lockSecret/lockSecret');
@@ -44,8 +43,7 @@ const plugins = {
 	namespace,
 	receipts,
 	restrictions,
-	transfer: empty,
-	cmc
+	transfer: empty
 };
 
 module.exports = {