Skip to content
This repository has been archived by the owner on Jun 10, 2022. It is now read-only.

Commit

Permalink
cr
Browse files Browse the repository at this point in the history
  • Loading branch information
Jaguar0625 committed Jul 18, 2019
1 parent a62e682 commit d8309e2
Show file tree
Hide file tree
Showing 21 changed files with 17 additions and 24 deletions.
3 changes: 2 additions & 1 deletion catapult-sdk/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ rules:

import/order:
- error
- groups:
- newlines-between: never
groups:
- index
- sibling
- parent
Expand Down
1 change: 0 additions & 1 deletion catapult-sdk/src/utils/schemaFormatter.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
/** @module utils/schemaFormatter */
const SchemaType = require('./SchemaType');


// if 'definition' is a number, it is the type
// otherwise, it is an object with an optional type property (default type is none)
const getSchemaType = definition => ('number' === typeof definition ? definition : definition.type || SchemaType.none);
Expand Down
1 change: 0 additions & 1 deletion catapult-sdk/test/plugins/accountLink_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const test = require('../binaryTestUtils');
const accountLinkPlugin = require('../../src/plugins/accountLink');
const { expect } = require('chai');


describe('account link plugin', () => {
describe('register schema', () => {
it('adds account link system schema', () => {
Expand Down
3 changes: 1 addition & 2 deletions catapult-sdk/test/plugins/accountRestrictions_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,9 @@
* along with Catapult. If not, see <http://www.gnu.org/licenses/>.
*/

const test = require('../binaryTestUtils');
const EntityType = require('../../src/model/EntityType');
const ModelSchemaBuilder = require('../../src/model/ModelSchemaBuilder');
const test = require('../binaryTestUtils');

const accountRestrictionsPlugin = require('../../src/plugins/accountRestrictions');
const { AccountRestrictionType } = require('../../src/plugins/accountRestrictions');
const { expect } = require('chai');
Expand Down
2 changes: 0 additions & 2 deletions catapult-sdk/test/plugins/receipts_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const schemaFormatter = require('../../src/utils/schemaFormatter');
const receiptsPlugin = require('../../src/plugins/receipts');
const { expect } = require('chai');


describe('receipts plugin', () => {
describe('register schema', () => {
it('adds receipts system schema', () => {
Expand Down Expand Up @@ -124,7 +123,6 @@ describe('receipts plugin', () => {
});
});


describe('conditional schema', () => {
describe('uses the correct conditional schema depending on receipt type', () => {
const formatReceipt = receipt => {
Expand Down
3 changes: 2 additions & 1 deletion catapult-sdk/test/utils/base32_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ describe('base32', () => {
const encoded = base32.encode(data);

// Assert:
const expected = 'AAAQEAYEAUDAOCAJBIFQYDIOB4IBCEQTCQKRMFYY'
const expected = ''
+ 'AAAQEAYEAUDAOCAJBIFQYDIOB4IBCEQTCQKRMFYY'
+ 'DENBWHA5DYPSAIJCEMSCKJRHFAUSUKZMFUXC6MBR'
+ 'GIZTINJWG44DSOR3HQ6T4P2AIFBEGRCFIZDUQSKK'
+ 'JNGE2TSPKBIVEU2UKVLFOWCZLJNVYXK6L5QGCYTD'
Expand Down
3 changes: 2 additions & 1 deletion monitor/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ rules:

import/order:
- error
- groups:
- newlines-between: never
groups:
- index
- sibling
- parent
Expand Down
3 changes: 2 additions & 1 deletion rest/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ rules:

import/order:
- error
- groups:
- newlines-between: never
groups:
- index
- sibling
- parent
Expand Down
1 change: 0 additions & 1 deletion rest/src/server/websocketUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const crypto = require('crypto');

const { base32 } = catapult.utils;


module.exports = {
/**
* Creates an aggregate subscriber composed of all websocket subscribers to a single topic.
Expand Down
1 change: 0 additions & 1 deletion rest/test/db/dbUtils_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

const dbUtils = require('../../src/db/dbUtils');
const MongoDb = require('mongodb');

const { expect } = require('chai');

describe('db utils', () => {
Expand Down
1 change: 0 additions & 1 deletion rest/test/db/utils/dbTestUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

const testDbOptions = require('./testDbOptions');
const CatapultDb = require('../../../src/db/CatapultDb');

const test = require('../../testUtils');
const catapult = require('catapult-sdk');
const MongoDb = require('mongodb');
Expand Down
1 change: 0 additions & 1 deletion rest/test/plugins/receipts/receiptsRoutes_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const receiptsRoutes = require('../../../src/plugins/receipts/receiptsRoutes');
const routeUtils = require('../../../src/routes/routeUtils');
const { MockServer } = require('../../routes/utils/routeTestUtils');
const sinon = require('sinon');

const { expect } = require('chai');

describe('receipts routes', () => {
Expand Down
1 change: 0 additions & 1 deletion rest/test/routes/blockRoutes_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const { MockServer, test } = require('./utils/routeTestUtils');
const blockRoutes = require('../../src/routes/blockRoutes');
const routeUtils = require('../../src/routes/routeUtils');
const sinon = require('sinon');

const { expect } = require('chai');

describe('block routes', () => {
Expand Down
1 change: 0 additions & 1 deletion rest/test/routes/networkRoutes_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const { test } = require('./utils/routeTestUtils');
const networkRoutes = require('../../src/routes/networkRoutes');
const { expect } = require('chai');


describe('network routes', () => {
describe('get', () => {
it('can retrieve network', () => {
Expand Down
1 change: 0 additions & 1 deletion rest/test/routes/nodeRoutes_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ describe('node routes', () => {
}
});


it('can retrieve node information', () => {
// Arrange:
const packet = {
Expand Down
3 changes: 1 addition & 2 deletions rest/test/routes/routeUtils_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
const { test } = require('./utils/routeTestUtils');
const routeUtils = require('../../src/routes/routeUtils');
const catapult = require('catapult-sdk');
const { expect } = require('chai');
const sinon = require('sinon');

const { convert } = catapult.utils;

const { expect } = require('chai');

const invalidObjectIdStrings = [
'112233445566778899AABB', // too short
'112233445566778899AABBCCDD', // too long
Expand Down
1 change: 0 additions & 1 deletion rest/test/routes/utils/routeTestUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const { expect } = require('chai');

const makeTestName = (base, desc) => (desc ? `${base} ${desc}` : base);


class MockServer {
constructor() {
this.routes = {};
Expand Down
2 changes: 1 addition & 1 deletion rest/test/server/bootstrapper_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ describe('server (bootstrapper)', () => {
const shouldHaveContent = undefined !== expectedContentLength;

const message = `received headers: ${JSON.stringify(headers)}`;
const numExpectedHeaders = 2
const numExpectedHeaders = 2
+ (options.numAdditionalHeaders | 0)
+ (shouldAllowCrossDomain ? 3 : 0)
+ (shouldHaveContent ? 2 : 0);
Expand Down
3 changes: 2 additions & 1 deletion scripts/eslint-templates/src.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ rules:

import/order:
- error
- groups:
- newlines-between: never
groups:
- index
- sibling
- parent
Expand Down
3 changes: 2 additions & 1 deletion spammer/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ rules:

import/order:
- error
- groups:
- newlines-between: never
groups:
- index
- sibling
- parent
Expand Down
3 changes: 2 additions & 1 deletion tools/.eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ rules:

import/order:
- error
- groups:
- newlines-between: never
groups:
- index
- sibling
- parent
Expand Down

0 comments on commit d8309e2

Please sign in to comment.