closes #74

Added some test utils, stubs, and tx helpers.

src/modules/blocks/chain.ts

@@ -4,7 +4,11 @@ import { IDatabase, ITask } from 'pg-promise';
 import { Bus, catchToLoggerAndRemapError, ILogger, Inserts, Sequence, TransactionType } from '../../helpers/';
 import { IBlockLogic, ITransactionLogic } from '../../ioc/interfaces/logic';
 import {
-  IAccountsModule, IBlocksModule, IBlocksModuleChain, IBlocksModuleUtils, IRoundsModule,
+  IAccountsModule,
+  IBlocksModule,
+  IBlocksModuleChain,
+  IBlocksModuleUtils,
+  IRoundsModule,
   ITransactionsModule
 } from '../../ioc/interfaces/modules';
 import { Symbols } from '../../ioc/symbols';
@@ -34,10 +38,10 @@ export class BlocksModuleChain implements IBlocksModuleChain {
   private genesisBlock: SignedAndChainedBlockType;
 
   // Helpers
-  @inject(Symbols.helpers.logger)
-  private logger: ILogger;
   @inject(Symbols.helpers.bus)
   private bus: Bus;
+  @inject(Symbols.helpers.logger)
+  private logger: ILogger;
   @inject(Symbols.helpers.sequence)
   @tagged(Symbols.helpers.sequence, Symbols.tags.helpers.balancesSequence)
   private balancesSequence: Sequence;
@@ -73,7 +77,7 @@ export class BlocksModuleChain implements IBlocksModuleChain {
     if (lastBlock.height === 1) {
       throw new Error('Cannot delete genesis block');
     }
-    const newLastBlock            = await this.popLastBlock(lastBlock);
+    const newLastBlock          = await this.popLastBlock(lastBlock);
     // Set new "new" last block.
     this.blocksModule.lastBlock = newLastBlock;
     return newLastBlock;
@@ -122,8 +126,17 @@ export class BlocksModuleChain implements IBlocksModuleChain {
    * @returns {Promise<void>}
    */
   public async applyGenesisBlock(block: SignedAndChainedBlockType) {
-    // This is a shitty sort. Does not take into account b and it's not ok
-    block.transactions.sort((a) => a.type === TransactionType.VOTE ? 1 : 0);
+    // Order vote transactions to be at the end of processing.
+    block.transactions.sort((a, b) => {
+      if (a.type !== b.type) {
+        if (a.type === TransactionType.VOTE) {
+          return 1;
+        } else if (b.type === TransactionType.VOTE) {
+          return -1;
+        }
+      }
+      return 0;
+    });
 
     const tracker = this.blocksModuleUtils.getBlockProgressLogger(
       block.transactions.length,

tests/integration/common/utils.ts

@@ -9,7 +9,7 @@ import initializer from './init';
 import { ISystemModule, ITransactionsModule } from '../../../src/ioc/interfaces/modules';
 import { Symbols } from '../../../src/ioc/symbols';
 import { LiskWallet } from 'dpos-offline/dist/es5/liskWallet';
-import { IBaseTransaction, VoteAsset } from '../../../src/logic/transactions';
+import * as txCrafter from '../../utils/txCrafter';
 
 const delegates = require('../genesisDelegates.json');
 
@@ -47,14 +47,11 @@ export const createRandomWallet  = (): LiskWallet => {
 
 export const createVoteTransaction = async (confirmations: number, from: LiskWallet, to: publicKey, add: boolean): Promise<ITransaction> => {
   const systemModule = initializer.appManager.container.get<ISystemModule>(Symbols.modules.system);
-  const t            = new dposOffline.transactions.VoteTx({
-    votes: [`${add ? '+' : '-'}${to}`],
+  const tx           = txCrafter.createVoteTransaction(from, systemModule.getFees().fees.vote, {
+    asset: {
+      votes: [`${add ? '+' : '-'}${to}`],
+    },
   });
-  t.set('amount', 0);
-  t.set('fee', systemModule.getFees().fees.vote);
-  t.set('timestamp', 0);
-  t.set('recipientId', from.address);
-  const tx = t.sign(from);
   if (confirmations > 0) {
     await confirmTransactions([tx], confirmations);
   }
@@ -63,12 +60,7 @@ export const createVoteTransaction = async (confirmations: number, from: LiskWal
 
 export const createSendTransaction = async (confirmations: number, amount: number, from: LiskWallet, dest: string): Promise<ITransaction> => {
   const systemModule = initializer.appManager.container.get<ISystemModule>(Symbols.modules.system);
-  const t            = new dposOffline.transactions.SendTx();
-  t.set('amount', amount);
-  t.set('fee', systemModule.getFees().fees.send);
-  t.set('timestamp', 0);
-  t.set('recipientId', dest);
-  const tx = t.sign(from);
+  const tx           = txCrafter.createSendTransaction(from, dest, systemModule.getFees().fees.send);
   if (confirmations > 0) {
     await confirmTransactions([tx], confirmations);
   }

tests/stubs/helpers/BusStub.ts

@@ -1,6 +1,8 @@
+import { injectable } from 'inversify';
 import { BaseStubClass } from '../BaseStubClass';
 import { stubMethod } from '../stubDecorator';
 
+@injectable()
 export class BusStub extends BaseStubClass {
   @stubMethod()
   public message(event: string, ...rest: any[]) {

tests/stubs/helpers/EdStub.ts

@@ -6,7 +6,7 @@ import { stubMethod } from '../stubDecorator';
 // tslint:disable no-empty
 
 @injectable()
-export default class EdStub extends BaseStubClass {
+export default class EdStub extends BaseStubClass  {
 
   @stubMethod()
   public sign() {}

tests/stubs/helpers/ExceptionsManagerStub.ts

@@ -1,6 +1,8 @@
+import { injectable } from 'inversify';
 import { BaseStubClass } from '../BaseStubClass';
 import { spyMethod, stubMethod } from '../stubDecorator';
 
+@injectable()
 export class ExceptionsManagerStub extends BaseStubClass {
   @spyMethod
   public registerExceptionHandler() {}

tests/stubs/helpers/SequenceStub.ts

@@ -1,19 +1,23 @@
 import { injectable } from 'inversify';
 import { Sequence } from '../../../src/helpers';
 import { BaseStubClass } from '../BaseStubClass';
-import { spyMethod } from '../stubDecorator';
+import { spyMethod, stubMethod } from '../stubDecorator';
 
 @injectable()
 export class SequenceStub extends BaseStubClass {
   private realImplementation: Sequence = new Sequence({});
 
   @spyMethod
-  public addAndPromise() {
+  public addAndPromise(w) {
+    return this.realImplementation.addAndPromise(w);
   }
 
   @spyMethod
   public count() {
-
+    return this.realImplementation.count();
   }
 
+  @stubMethod()
+  public ____noiop() {
+  }
 }

tests/stubs/helpers/ZSchemaStub.ts

@@ -1,5 +1,7 @@
+import { injectable } from 'inversify';
 import * as sinon from 'sinon';
 
+@injectable()
 export default class ZSchemaStub {
   public stubConfig: {
     validate: {return: any}

tests/stubs/logic/BlockRewardLogicStub.ts

@@ -1,5 +1,7 @@
+import { injectable } from 'inversify';
 import * as sinon from 'sinon';
 
+@injectable()
 export default class BlockRewardLogicStub {
   public stubConfig: {
     initRewards: {

tests/stubs/logic/PeerLogicStub.ts

@@ -1,5 +1,7 @@
+import { injectable } from 'inversify';
 import * as sinon from 'sinon';
 
+@injectable()
 export default class PeerLogicStub {
   public stubConfig: {
     accept: {

tests/stubs/logic/PeersLogicStub.ts

@@ -1,8 +1,10 @@
+import { injectable } from 'inversify';
 import { IPeerLogic, IPeersLogic } from '../../../src/ioc/interfaces/logic';
 import { BasePeerType, PeerType } from '../../../src/logic';
 import { BaseStubClass } from '../BaseStubClass';
 import { stubMethod } from '../stubDecorator';
 
+@injectable()
 export class PeersLogicStub extends BaseStubClass implements IPeersLogic {
   @stubMethod()
   public create(peer: BasePeerType): IPeerLogic {

tests/stubs/logic/RoundLogicStub.ts

@@ -1,65 +1,67 @@
+import { injectable } from 'inversify';
 import { IRoundLogic } from '../../../src/ioc/interfaces/logic';
 import { BaseStubClass } from '../BaseStubClass';
 import { stubMethod } from '../stubDecorator';
 
+@injectable()
 export class RoundLogicStub extends BaseStubClass implements IRoundLogic {
 
-  @stubMethod
+  @stubMethod()
   public mergeBlockGenerator(): Promise<void> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public updateMissedBlocks(): Promise<void> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public getVotes(): Promise<Array<{ delegate: string; amount: number }>> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public updateVotes(): Promise<void> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public markBlockId(): Promise<void> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public flushRound(): Promise<void> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public truncateBlocks(): Promise<null> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public restoreRoundSnapshot(): Promise<null> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public restoreVotesSnapshot(): Promise<null> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public applyRound(): Promise<void> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public land(): Promise<void> {
     return undefined;
   }
 
-  @stubMethod
+  @stubMethod()
   public backwardLand(): Promise<void> {
     return undefined;
   }