Merge branch 'HEAD'

Author: deanpress

__tests__/__support__/index.ts

@@ -5,9 +5,9 @@ import { Wallets } from '@arkecosystem/core-state';
 import { Crypto, Identities, Managers, Utils } from '@arkecosystem/crypto';
 import delay from 'delay';
 import * as fs from 'fs';
+import { createHandyClient } from 'handy-redis';
 import cloneDeep from 'lodash.clonedeep';
 import * as path from 'path';
-import { createHandyClient } from 'handy-redis';
 import { secrets } from '../../../../__tests__/utils/config/nospluginnet/delegates.json';
 import { setUpContainer } from '../../../../__tests__/utils/helpers/container';
 

__tests__/staking.integration.test.ts

@@ -40,7 +40,7 @@ beforeAll(async () => {
         synchronize: true,
     });
     Managers.configManager.setFromPreset("testnet");
-    Managers.configManager.setHeight(1);
+    Managers.configManager.setHeight(2);
     Handlers.Registry.registerTransactionHandler(StakeCreateTransactionHandler);
     Handlers.Registry.registerTransactionHandler(StakeRedeemTransactionHandler);
 });
@@ -304,9 +304,9 @@ describe("Staking Transactions", () => {
         );
         expect(voter.getAttribute("stakes")[stakeTransaction.id]).toEqual({
             id: stakeTransaction.id,
-            amount: stakeAmount,
+            amount: stakeAmount.toString(),
             duration: 7889400,
-            weight: stakeAmount.times(configManager.getMilestone().stakeLevels['7889400']).dividedBy(10),
+            weight: stakeAmount.times(configManager.getMilestone().stakeLevels['7889400']).dividedBy(10).toString(),
             redeemableTimestamp: stakeTransaction.data.asset.stakeCreate.timestamp + 7889400,
             redeemed: false,
             halved: false,

__tests__/staking.unit.test.ts

@@ -1,5 +1,4 @@
 {
-  "private": true,
   "name": "@nosplatform/stake-transactions",
   "description": "Provides stake transactions for Ark Core",
   "version": "0.0.2",
@@ -12,15 +11,15 @@
     "dist"
   ],
   "scripts": {
-    "prepublishOnly": "yarn test && yarn build",
+    "prepublishOnly": "yarn build",
     "pretest": "yarn lint && yarn build",
     "compile": "../../node_modules/typescript/bin/tsc",
     "build": "yarn clean && yarn compile",
     "build:watch": "yarn clean && yarn compile -w",
     "clean": "del dist",
     "docs": "../../node_modules/typedoc/bin/typedoc src --out docs",
     "lint": "../../node_modules/tslint/bin/tslint -c ./tslint.json 'src/**/*.ts' '__tests__/**/*.ts' --fix",
-    "test": "cross-env CORE_ENV=test jest --runInBand --forceExit",
+    "test": "cross-env CORE_ENV=test jest --runInBand --forceExit --passWithNoTests",
     "test:coverage": "cross-env CORE_ENV=test jest --coverage --coveragePathIgnorePatterns='/(defaults.ts|index.ts)$' --runInBand --forceExit",
     "test:debug": "cross-env CORE_ENV=test node --inspect-brk ../../node_modules/.bin/jest --runInBand",
     "test:watch": "cross-env CORE_ENV=test jest --runInBand --watch",
@@ -31,10 +30,9 @@
     "@arkecosystem/core-interfaces": "^2.6.0-next.7",
     "@arkecosystem/core-transactions": "^2.6.0-next.7",
     "@arkecosystem/crypto": "^2.6.0-next.7",
-    "@nosplatform/stake-transactions-crypto": "^0.0.1",
-    "@nosplatform/storage": "^0.0.2",
-    "redis": "^2.8.0",
-    "handy-redis": "^1.7.0"
+    "@nosplatform/stake-transactions-crypto": "^0.1.0-alpha.3",
+    "handy-redis": "^1.7.0",
+    "redis": "^2.8.0"
   },
   "devDependencies": {
     "@sindresorhus/tsconfig": "^0.5.0",
@@ -46,13 +44,18 @@
     "jest-extended": "^0.11.2",
     "npm-check-updates": "^3.1.0",
     "regenerator-runtime": "^0.13.0",
-    "ts-jest": "^24.0.2",
+    "ts-jest": "^24.3.0",
     "tslint": "^5.12.0",
     "tslint-config-prettier": "^1.17.0",
     "typedoc": "^0.15.0",
     "typescript": "^3.2.4"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "jest": {
-    "preset": "../../jest-preset.json"
+    "transform": {
+      "^.+\\.tsx?$": "ts-jest"
+    }
   }
-}
+}

package.json

@@ -10,12 +10,12 @@ import {
 } from '@nosplatform/stake-transactions-crypto';
 
 import {
+    LessThanMinimumStakeError,
     NotEnoughBalanceError,
     StakeAlreadyExistsError,
     StakeDurationError,
     StakeNotIntegerError,
     StakeTimestampError,
-    LessThanMinimumStakeError,
 } from '../errors';
 import { ExpireHelper, VoteWeight } from '../helpers';
 

src/handlers/stake-create.ts

@@ -8,8 +8,8 @@ import {
 } from '@nosplatform/stake-transactions-crypto';
 
 import { StakeAlreadyRedeemedError, StakeNotFoundError, StakeNotYetRedeemableError, WalletHasNoStakeError } from '../errors';
-import { StakeCreateTransactionHandler } from './stake-create';
 import { ExpireHelper } from '../helpers';
+import { StakeCreateTransactionHandler } from './stake-create';
 
 export class StakeRedeemTransactionHandler extends Handlers.TransactionHandler {
     public getConstructor(): Transactions.TransactionConstructor {

src/handlers/stake-redeem.ts

@@ -2,11 +2,11 @@ import { app } from '@arkecosystem/core-container';
 import { Container, EventEmitter, Logger } from '@arkecosystem/core-interfaces';
 import { Handlers } from '@arkecosystem/core-transactions';
 import { roundCalculator } from '@arkecosystem/core-utils';
+import { createHandyClient } from 'handy-redis';
 import { defaults } from './defaults';
 import { StakeCreateTransactionHandler } from './handlers/stake-create';
 import { StakeRedeemTransactionHandler } from './handlers/stake-redeem';
 import * as StakeHelpers from './helpers';
-import { createHandyClient } from 'handy-redis';
 
 const emitter = app.resolvePlugin<EventEmitter.EventEmitter>("event-emitter");
 const redis = createHandyClient();

src/plugin.ts

@@ -0,0 +1,25 @@
+{
+    "extends": ["tslint:recommended", "tslint-config-prettier"],
+    "rules": {
+        "ban": [
+            true,
+            {
+                "name": ["assert", "equal"],
+                "message": "Use 'strictEqual' instead."
+            },
+            {
+                "name": ["*", "forEach"],
+                "message": "Use a regular for loop instead."
+            }
+        ],
+        "await-promise": true,
+        "no-console": false,
+        "no-default-export": true,
+        "no-null-keyword": false,
+        "no-shadowed-variable": false,
+        "object-literal-sort-keys": false,
+        "only-arrow-functions": true,
+        "radix": false,
+        "return-undefined": true
+    }
+}