From 54eb7f37fa332d6fc04876ae1256a8c806ce43bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Moreau?= <cem.moreau@gmail.com> Date: Thu, 25 Jan 2018 21:32:41 +0100 Subject: [PATCH] [fix] #1260 The chaining test was wrong --- test/integration/transactions-chaining.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/integration/transactions-chaining.ts b/test/integration/transactions-chaining.ts index cbcbddf8f..3d58e6a46 100644 --- a/test/integration/transactions-chaining.ts +++ b/test/integration/transactions-chaining.ts @@ -1,7 +1,6 @@ import {CommonConstants} from "../../app/lib/common-libs/constants" import {TestUser} from "./tools/TestUser" import {TestingServer} from "./tools/toolbox" -import {NewLogger} from "../../app/lib/logger" const should = require('should'); const assert = require('assert'); @@ -71,9 +70,12 @@ describe("Transaction chaining", () => { CommonConstants.TRANSACTION_MAX_TRIES = 2; await unit.shouldNotFail(toc.sendTX(tx1)); await unit.shouldNotFail(toc.sendTX(tx2)); - (await s1.get('/tx/sources/DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo')).should.have.property('sources').length(1); - (await s1.get('/tx/sources/DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV')).should.have.property('sources').length(1); - await s1.commit({ time: now + 7210 }); // TX1 + TX2 commited + (await s1.get('/tx/sources/DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo')).should.have.property('sources').length(1); // 1200 + (await s1.get('/tx/sources/DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV')).should.have.property('sources').length(1); // 1200 + await s1.commit({ time: now + 7210 }); // TX1 commited only + (await s1.get('/tx/sources/DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo')).should.have.property('sources').length(1); // 1200 - 1040 = 160 remaining + (await s1.get('/tx/sources/DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV')).should.have.property('sources').length(2); // The UD + 1040 units sent by toc + await s1.commit({ time: now + 7210 }); // TX2 commited now (cause it couldn't be chained before) (await s1.get('/tx/sources/DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo')).should.have.property('sources').length(0); (await s1.get('/tx/sources/DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV')).should.have.property('sources').length(3); // The UD + 1040 + 160 units sent by toc CommonConstants.TRANSACTION_MAX_TRIES = tmp; -- GitLab