Merge pull request #65 from Muzikie/add-new-modules

Sync Streamer with new changes in modules and events at blockchain

services/blockchain-connector/shared/sdk/constants/eventTopics.js

@@ -76,21 +76,13 @@ const {
 	EVENT_NAME_ACCOUNT_RECLAIMED,
 	EVENT_NAME_KEYS_REGISTERED,
 
-	MODULE_NAME_SUBSCRIPTION,
-	EVENT_NAME_SUBSCRIPTION_CREATED,
-	EVENT_NAME_SUBSCRIPTION_PURCHASED,
+	MODULE_NAME_BADGE,
+	EVENT_NAME_BADGE_CREATED,
+	EVENT_NAME_BADGE_CLAIMED,
 
-	MODULE_NAME_COLLECTION,
-	EVENT_NAME_COLLECTION_CREATED,
-	EVENT_NAME_COLLECTION_TRANSFERED,
-
-	MODULE_NAME_AUDIO,
-	EVENT_NAME_AUDIO_CREATED,
-	EVENT_NAME_AUDIO_STREAMED,
-	EVENT_NAME_AUDIO_INCOME_RECLAIMED,
-
-	MODULE_NAME_PROFILE,
-	EVENT_NAME_PROFILE_CREATED,
+	MODULE_NAME_ANCHOR,
+	EVENT_NAME_ANCHOR_CREATED,
+	EVENT_NAME_ANCHOR_VOTED,
 } = require('./names');
 
 const COMMAND_EXECUTION_RESULT_TOPICS = ['transactionID'];
@@ -162,21 +154,13 @@ const EVENT_TOPIC_MAPPINGS_BY_MODULE = {
 		[EVENT_NAME_ACCOUNT_RECLAIMED]: ['transactionID', 'legacyAddress', 'newAddress'],
 		[EVENT_NAME_KEYS_REGISTERED]: ['transactionID', 'validatorAddress', 'generatorKey', 'blsKey'],
 	},
-	[MODULE_NAME_SUBSCRIPTION]: {
-		[EVENT_NAME_SUBSCRIPTION_CREATED]: ['transactionID', 'senderAddress'],
-		[EVENT_NAME_SUBSCRIPTION_PURCHASED]: ['transactionID', 'senderAddress'],
-	},
-	[MODULE_NAME_COLLECTION]: {
-		[EVENT_NAME_COLLECTION_CREATED]: ['transactionID', 'senderAddress'],
-		[EVENT_NAME_COLLECTION_TRANSFERED]: ['transactionID', 'senderAddress'],
-	},
-	[MODULE_NAME_AUDIO]: {
-		[EVENT_NAME_AUDIO_CREATED]: ['transactionID', 'senderAddress'],
-		[EVENT_NAME_AUDIO_STREAMED]: ['transactionID', 'senderAddress'],
-		[EVENT_NAME_AUDIO_INCOME_RECLAIMED]: ['transactionID', 'senderAddress'],
+	[MODULE_NAME_BADGE]: {
+		[EVENT_NAME_BADGE_CREATED]: ['transactionID', 'senderAddress'],
+		[EVENT_NAME_BADGE_CLAIMED]: ['transactionID', 'senderAddress'],
 	},
-	[MODULE_NAME_PROFILE]: {
-		[EVENT_NAME_PROFILE_CREATED]: ['transactionID', 'senderAddress'],
+	[MODULE_NAME_ANCHOR]: {
+		[EVENT_NAME_ANCHOR_CREATED]: ['transactionID', 'senderAddress'],
+		[EVENT_NAME_ANCHOR_VOTED]: ['transactionID', 'senderAddress'],
 	},
 };
 

services/blockchain-connector/shared/sdk/constants/names.js

@@ -87,25 +87,16 @@ const MODULE_NAME_LEGACY = 'legacy';
 const EVENT_NAME_ACCOUNT_RECLAIMED = 'accountReclaimed';
 const EVENT_NAME_KEYS_REGISTERED = 'keysRegistered';
 
-// Subscription
-const MODULE_NAME_SUBSCRIPTION = 'subscription';
-const EVENT_NAME_SUBSCRIPTION_CREATED = 'subscriptionCreated';
-const EVENT_NAME_SUBSCRIPTION_PURCHASED = 'subscriptionPurchased';
-
-// Collection
-const MODULE_NAME_COLLECTION = 'collection';
-const EVENT_NAME_COLLECTION_CREATED = 'collectionCreated';
-const EVENT_NAME_COLLECTION_TRANSFERED = 'collectionTransfered';
-
-// Audios
-const MODULE_NAME_AUDIO = 'audio';
-const EVENT_NAME_AUDIO_CREATED = 'audioCreated';
-const EVENT_NAME_AUDIO_STREAMED = 'audioStreamed';
-const EVENT_NAME_AUDIO_INCOME_RECLAIMED = 'audioIncomeReclaimed';
-
-// Profiles
-const MODULE_NAME_PROFILE = 'profile';
-const EVENT_NAME_PROFILE_CREATED = 'profileCreated';
+// Badges
+const MODULE_NAME_BADGE = 'badge';
+const EVENT_NAME_BADGE_CREATED = 'badgeCreated';
+const EVENT_NAME_BADGE_CLAIMED = 'badgeClaimed';
+
+// Anchors
+const MODULE_NAME_ANCHOR = 'anchor';
+const EVENT_NAME_ANCHOR_CREATED = 'anchorCreated';
+const EVENT_NAME_ANCHOR_VOTED = 'anchorVoted';
+const EVENT_NAME_ANCHOR_DESTROYED = 'anchorDestroyed';
 
 module.exports = {
 	MODULE_NAME_AUTH,
@@ -171,19 +162,12 @@ module.exports = {
 	EVENT_NAME_ACCOUNT_RECLAIMED,
 	EVENT_NAME_KEYS_REGISTERED,
 
-	MODULE_NAME_SUBSCRIPTION,
-	EVENT_NAME_SUBSCRIPTION_CREATED,
-	EVENT_NAME_SUBSCRIPTION_PURCHASED,
-
-	MODULE_NAME_COLLECTION,
-	EVENT_NAME_COLLECTION_CREATED,
-	EVENT_NAME_COLLECTION_TRANSFERED,
-
-	MODULE_NAME_AUDIO,
-	EVENT_NAME_AUDIO_CREATED,
-	EVENT_NAME_AUDIO_STREAMED,
-	EVENT_NAME_AUDIO_INCOME_RECLAIMED,
+	MODULE_NAME_BADGE,
+	EVENT_NAME_BADGE_CREATED,
+	EVENT_NAME_BADGE_CLAIMED,
 
-	MODULE_NAME_PROFILE,
-	EVENT_NAME_PROFILE_CREATED,
+	MODULE_NAME_ANCHOR,
+	EVENT_NAME_ANCHOR_CREATED,
+	EVENT_NAME_ANCHOR_DESTROYED,
+	EVENT_NAME_ANCHOR_VOTED,
 };

services/blockchain-connector/tests/functional/formatter.test.js

@@ -84,7 +84,7 @@ xdescribe('Functional tests for formatter', () => {
 		expect(result).toMatchObject(decodedBlockWithoutTransaction);
 	});
 
-	it('format subscription event payload', async () => {
+	it('format badge event payload', async () => {
 		const result = await broker.call('connector.formatAPIClientEventPayload', {
 			eventName: 'app_newBlock',
 			payload: { block: blockWithTransaction },

services/blockchain-indexer/methods/dataService/controllers/profiles.js → services/blockchain-indexer/methods/dataService/controllers/anchors.js

@@ -5,18 +5,18 @@ const {
 
 const dataService = require('../../../shared/dataService');
 
-const getProfiles = async params => {
-	const profiles = {
+const getAnchors = async params => {
+	const anchors = {
 		data: [],
 		meta: {},
 	};
 
 	try {
-		const response = await dataService.getProfiles(params);
-		if (response.data) profiles.data = response.data;
-		if (response.meta) profiles.meta = response.meta;
+		const response = await dataService.getAnchors(params);
+		if (response.data) anchors.data = response.data;
+		if (response.meta) anchors.meta = response.meta;
 
-		return profiles;
+		return anchors;
 	} catch (err) {
 		let status;
 		if (err instanceof InvalidParamsException) status = 'INVALID_PARAMS';
@@ -27,5 +27,5 @@ const getProfiles = async params => {
 };
 
 module.exports = {
-	getProfiles,
+	getAnchors,
 };

services/blockchain-indexer/methods/dataService/controllers/audios.js → services/blockchain-indexer/methods/dataService/controllers/badges.js

@@ -5,18 +5,18 @@ const {
 
 const dataService = require('../../../shared/dataService');
 
-const getAudios = async params => {
-	const audios = {
+const getBadges = async params => {
+	const badges = {
 		data: [],
 		meta: {},
 	};
 
 	try {
-		const response = await dataService.getAudios(params);
-		if (response.data) audios.data = response.data;
-		if (response.meta) audios.meta = response.meta;
+		const response = await dataService.getBadges(params);
+		if (response.data) badges.data = response.data;
+		if (response.meta) badges.meta = response.meta;
 
-		return audios;
+		return badges;
 	} catch (err) {
 		let status;
 		if (err instanceof InvalidParamsException) status = 'INVALID_PARAMS';
@@ -27,5 +27,5 @@ const getAudios = async params => {
 };
 
 module.exports = {
-	getAudios,
+	getBadges,
 };

services/blockchain-indexer/methods/dataService/modules/anchor.js

@@ -0,0 +1,17 @@
+const {
+	getAnchors,
+} = require('../controllers/anchors');
+
+module.exports = [
+	{
+		name: 'anchors',
+		controller: getAnchors,
+		params: {
+			submitter: { optional: true, type: 'string' },
+			anchorID: { optional: true, type: 'string' },
+			limit: { optional: true, type: 'number' },
+			offset: { optional: true, type: 'number' },
+			winner: { optional: true, type: 'number' },
+		},
+	},
+];

services/blockchain-indexer/methods/dataService/modules/badge.js

@@ -0,0 +1,18 @@
+const {
+	getBadges,
+} = require('../controllers/badges');
+
+module.exports = [
+	{
+		name: 'badges',
+		controller: getBadges,
+		params: {
+			awardedTo: { optional: true, type: 'string' },
+			badgeID: { optional: true, type: 'string' },
+			anchorID: { optional: true, type: 'string' },
+			type: { optional: true, type: 'string' },
+			limit: { optional: true, type: 'number' },
+			offset: { optional: true, type: 'number' },
+		},
+	},
+];

services/blockchain-indexer/shared/dataService/anchors.js

@@ -0,0 +1,23 @@
+const { Logger } = require('lisk-service-framework');
+const util = require('util');
+
+const logger = Logger();
+
+const business = require('./business');
+
+const getAnchors = async params => {
+	// Store logs
+	if (params.anchorID) logger.debug(`Retrieved anchor with ID ${params.anchorID} from Lisk Core`);
+	else if (params.submitter) logger.debug(`Retrieved anchor with submitter: ${params.submitter} from Lisk Core`);
+	else if (params.winner) logger.debug('Retrieved winner anchors from Lisk Core');
+	else logger.debug(`Retrieved anchors with custom search: ${util.inspect(params)} from Lisk Core`);
+
+	// Get data from server
+	const response = await business.getAnchors(params);
+
+	return response;
+};
+
+module.exports = {
+	getAnchors,
+};