diff --git a/app/controllers/blockchain.js b/app/controllers/blockchain.js
index 58f5d54fdd87f80a890221d9800741e554d969c4..e0a3e4a37bd6491e528c4118ff6b7435c4b5c4c7 100644
--- a/app/controllers/blockchain.js
+++ b/app/controllers/blockchain.js
@@ -98,7 +98,7 @@ function BlockchainBinding (server) {
this.difficulties = () => co(function *() {
const current = yield server.dal.getCurrentBlockOrNull();
const number = (current && current.number) || 0;
- const issuers = yield server.dal.getUniqueIssuersBetween(number - 1 - conf.blocksRot, number - 1);
+ const issuers = yield server.dal.getUniqueIssuersBetween(number - 1 - current.issuersFrame, number - 1);
const difficulties = [];
for (const issuer of issuers) {
const member = yield server.dal.getWrittenIdtyByPubkey(issuer);
diff --git a/app/lib/computation/blockGenerator.js b/app/lib/computation/blockGenerator.js
index 27d24825361f87d0f0c3be81a7790be59fc069ce..4fad108d3b309101ee7397cbc530158e34b51da1 100644
--- a/app/lib/computation/blockGenerator.js
+++ b/app/lib/computation/blockGenerator.js
@@ -444,7 +444,7 @@ function BlockGenerator(mainContext, prover) {
conf.sigPeriod, conf.sigStock, conf.sigWindow, conf.sigValidity,
conf.sigQty, conf.idtyWindow, conf.msWindow, conf.xpercent, conf.msValidity,
conf.stepMax, conf.medianTimeBlocks, conf.avgGenTime, conf.dtDiffEval,
- conf.blocksRot, (conf.percentRot == 1 ? "1.0" : conf.percentRot)
+ (conf.percentRot == 1 ? "1.0" : conf.percentRot)
].join(':');
block.previousHash = current ? current.hash : "";
block.previousIssuer = current ? current.issuer : "";
diff --git a/app/lib/computation/blockchainContext.js b/app/lib/computation/blockchainContext.js
index 86864391cc611db7f992d4011dbfa29c2093f252..08063b92dd06f189265e26a50124b1d80d62548b 100644
--- a/app/lib/computation/blockchainContext.js
+++ b/app/lib/computation/blockchainContext.js
@@ -521,7 +521,6 @@ function BlockchainContext() {
conf.medianTimeBlocks = bconf.medianTimeBlocks;
conf.avgGenTime = bconf.avgGenTime;
conf.dtDiffEval = bconf.dtDiffEval;
- conf.blocksRot = bconf.blocksRot;
conf.percentRot = bconf.percentRot;
conf.currency = block.currency;
// Super important: adapt wotb module to handle the correct stock
diff --git a/app/lib/constants.js b/app/lib/constants.js
index a72cdfb506c63ed546c2e0d40d7e295704e503db..b2f8138be925245f9940722bde3bd24d08905f5b 100644
--- a/app/lib/constants.js
+++ b/app/lib/constants.js
@@ -215,7 +215,7 @@ module.exports = {
BLOCK_ISSUERS_FRAME:find('IssuersFrame: (' + INTEGER + ')'),
BLOCK_ISSUERS_FRAME_VAR:find('IssuersFrameVar: (' + RELATIVE_INTEGER + ')'),
DIFFERENT_ISSUERS_COUNT:find('DifferentIssuersCount: (' + INTEGER + ')'),
- PARAMETERS: find("Parameters: (" + FLOAT + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + FLOAT + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + FLOAT + ")"),
+ PARAMETERS: find("Parameters: (" + FLOAT + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + FLOAT + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + INTEGER + ":" + FLOAT + ")"),
JOINER: exact(PUBKEY + ":" + SIGNATURE + ":" + BLOCK_UID + ":" + BLOCK_UID + ":" + USER_ID),
ACTIVE: exact(PUBKEY + ":" + SIGNATURE + ":" + BLOCK_UID + ":" + BLOCK_UID + ":" + USER_ID),
LEAVER: exact(PUBKEY + ":" + SIGNATURE + ":" + BLOCK_UID + ":" + BLOCK_UID + ":" + USER_ID),
diff --git a/app/lib/dal/fileDALs/confDAL.js b/app/lib/dal/fileDALs/confDAL.js
index 5d5d483964a9c2e9b4ee072064dcfbfb12e10ab4..e6331af335d6aa83c4cfabcfd3fdb75e32b850d2 100644
--- a/app/lib/dal/fileDALs/confDAL.js
+++ b/app/lib/dal/fileDALs/confDAL.js
@@ -40,7 +40,6 @@ function ConfDAL(rootPath, qioFS, parentCore, localDAL, AbstractStorage) {
"medianTimeBlocks": parseInt(conf.medianTimeBlocks,10),
"avgGenTime": parseInt(conf.avgGenTime,10),
"dtDiffEval": parseInt(conf.dtDiffEval,10),
- "blocksRot": parseInt(conf.blocksRot,10),
"percentRot": parseFloat(conf.percentRot)
};
});
diff --git a/app/lib/entity/block.js b/app/lib/entity/block.js
index 74412004e815861f53771098ce7f2dadb16e8ee2..743c16206a87df5fcbd69de29108d2b63793f337 100644
--- a/app/lib/entity/block.js
+++ b/app/lib/entity/block.js
@@ -242,7 +242,6 @@ Block.statics.getConf = (block) => {
bconf.medianTimeBlocks = parseInt(sp[13]);
bconf.avgGenTime = parseInt(sp[14]);
bconf.dtDiffEval = parseInt(sp[15]);
- bconf.blocksRot = parseInt(sp[16]);
- bconf.percentRot = parseFloat(sp[17]);
+ bconf.percentRot = parseFloat(sp[16]);
return bconf;
};
diff --git a/app/lib/entity/configuration.js b/app/lib/entity/configuration.js
index 5a2e60115ab857d83e7565498f5c194e765dcb88..cd840569933374b87dcf442e6e560c39a6958878 100644
--- a/app/lib/entity/configuration.js
+++ b/app/lib/entity/configuration.js
@@ -29,7 +29,6 @@ const defaultConf = function() {
"sigQty": constants.CONTRACT.DEFAULT.SIGQTY,
"xpercent": constants.CONTRACT.DEFAULT.X_PERCENT,
"percentRot": constants.CONTRACT.DEFAULT.PERCENTROT,
- "blocksRot": constants.CONTRACT.DEFAULT.BLOCKSROT,
"powDelay": constants.CONTRACT.DEFAULT.POWDELAY,
"avgGenTime": constants.CONTRACT.DEFAULT.AVGGENTIME,
"dtDiffEval": constants.CONTRACT.DEFAULT.DTDIFFEVAL,
diff --git a/app/lib/streams/dtos.js b/app/lib/streams/dtos.js
index e5862c858f348c2a9df174113f0bb708c4b1ef13..92661f943ae46f19225c96b9c57ecfb3372b140f 100644
--- a/app/lib/streams/dtos.js
+++ b/app/lib/streams/dtos.js
@@ -30,7 +30,6 @@ dtos.Parameters = {
medianTimeBlocks: Number,
avgGenTime: Number,
dtDiffEval: Number,
- blocksRot: Number,
percentRot: Number
};
diff --git a/app/lib/wizard.js b/app/lib/wizard.js
index 8aaa61ae72659067f7a59b42ae3b2dd3a8180144..6612e6a09510d9cabef6d157035212a8d1a76240 100644
--- a/app/lib/wizard.js
+++ b/app/lib/wizard.js
@@ -168,7 +168,6 @@ const tasks = {
async.apply(simpleInteger, "Number of blocks on which is computed median time", "medianTimeBlocks", conf),
async.apply(simpleInteger, "The average time for writing 1 block (wished time)", "avgGenTime", conf),
async.apply(simpleInteger, "Frequency, in number of blocks, to wait for changing common difficulty", "dtDiffEval", conf),
- async.apply(simpleInteger, "Number of blocks to check in past for deducing personalized difficulty", "blocksRot", conf),
async.apply(simpleFloat, "Weight in percent for previous issuers", "percentRot", conf)
], done);
},
diff --git a/doc/HTTP_API.md b/doc/HTTP_API.md
index 5878f7e4e0e33132dcb756d04eea3e5fbfd440b1..6cd7f026cb97859980a2aa0db37e62fc254b7f11 100644
--- a/doc/HTTP_API.md
+++ b/doc/HTTP_API.md
@@ -636,7 +636,6 @@ The synchronization parameters.
medianTimeBlocks: 11,
avgGenTime: 600,
dtDiffEval: 10,
- blocksRot: 20,
percentRot: 0.67
}
```
@@ -879,7 +878,7 @@ None.
**Returns**
-The respective difficulty of each member in the last `blocksRot` blocks for current block.
+The respective difficulty of each member in the last `IssuersFrame` blocks for current block.
```json
{
"block": 598,
diff --git a/doc/Protocol.md b/doc/Protocol.md
index 12c950b14d14668f37ded7080ec637dfe11958cd..83915e5e04428a217ec93b238530a11be271d1a1 100644
--- a/doc/Protocol.md
+++ b/doc/Protocol.md
@@ -854,7 +854,7 @@ To be valid, a block must match the following rules:
* `Transactions` is a multiline field composed of [compact transactions](#compact-format)
* `Parameters` is a simple line field, composed of 1 float, 12 integers and 1 last float all separated by a colon `:`, and representing [currency parameters](#protocol-parameters) (a.k.a Protocol parameters, but valued for a given currency):
- c:dt:ud0:sigPeriod:sigStock:sigWindow:sigValidity:sigQty:idtyWindow:msWindow:xpercent:msValidity:stepMax:medianTimeBlocks:avgGenTime:dtDiffEval:blocksRot:percentRot
+ c:dt:ud0:sigPeriod:sigStock:sigWindow:sigValidity:sigQty:idtyWindow:msWindow:xpercent:msValidity:stepMax:medianTimeBlocks:avgGenTime:dtDiffEval:percentRot
The document must be ended with a `BOTTOM_SIGNATURE` [Signature](#signature).
@@ -968,7 +968,6 @@ stepMax | Maximum distance between each WoT member and a newcomer
medianTimeBlocks | Number of blocks used for calculating median time.
avgGenTime | The average time for writing 1 block (wished time)
dtDiffEval | The number of blocks required to evaluate again `PoWMin` value
-blocksRot | The number of previous blocks to check for personalized difficulty
percentRot | The percent of previous issuers to reach for personalized difficulty
txWindow | `= 3600 * 24 * 7`. Maximum delay a transaction can wait before being expired for non-writing.
diff --git a/server.js b/server.js
index 1242c6bd513e5283b0dc5986c924e3ed221d1d68..8699dac40ccb4e8cb5cd707b4e457b2dcca3d1ed 100644
--- a/server.js
+++ b/server.js
@@ -120,7 +120,6 @@ function Server (dbConf, overrideConf) {
msWindow: constants.CONTRACT.DEFAULT.MSWINDOW,
xpercent: constants.CONTRACT.DEFAULT.X_PERCENT,
percentRot: constants.CONTRACT.DEFAULT.PERCENTROT,
- blocksRot: constants.CONTRACT.DEFAULT.BLOCKSROT,
powDelay: constants.CONTRACT.DEFAULT.POWDELAY,
avgGenTime: constants.CONTRACT.DEFAULT.AVGGENTIME,
dtDiffEval: constants.CONTRACT.DEFAULT.DTDIFFEVAL,
diff --git a/test/data/blockchain.json b/test/data/blockchain.json
index 369e5231b7eb48827a19455e0a7a1d43df017312..5e8074246c3adac716a2ee59326d47da89edc8d0 100644
--- a/test/data/blockchain.json
+++ b/test/data/blockchain.json
@@ -2,11 +2,11 @@
"blocks": [
{
"version": 10,
- "nonce": 300000000001,
+ "nonce": 100000000001,
"number": 0,
"powMin": 0,
- "time": 1483614905,
- "medianTime": 1483614905,
+ "time": 1483970065,
+ "medianTime": 1483970065,
"membersCount": 2,
"monetaryMass": null,
"unitbase": 0,
@@ -16,12 +16,12 @@
"len": 6,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "WJourHkd6NnMxKDSEfrsiB7qE0mGbiFHSwy0cE8/q/is6hTd0mzlMNBPxDhoPkAiocfXJrQuIVeG0/ygxQrTBw==",
- "hash": "0DCD782E25C04B3E77A7B5687893212AF0C8AE20687A13655D1068DA536FBF3E",
- "parameters": "0.007376575:3600:120:0:40:604800:31536000:1:604800:604800:0.9:31536000:3:20:960:10:20:0.6666666666666666",
+ "signature": "xsABrNW4d4SwiJzuJrAfSJkENuMC1yyedtvIlQXDJENmi2zeHKLcMfe4tK7qVpFPbBgK01EewljOom6y7jbkBg==",
+ "hash": "CAEDB205C3B995922A78D167DD9A078312E6A169F8C3800F5060242D7A159751",
+ "parameters": "0.007376575:3600:120:0:40:604800:31536000:1:604800:604800:0.9:31536000:3:20:960:10:0.6666666666666666",
"previousHash": null,
"previousIssuer": null,
- "inner_hash": "3969BE7A32853B2AB526662E88A2F1BFD852048C6B1DAEF0483F3DF64757AF48",
+ "inner_hash": "503EA11DD809C1FCCA8D4E71EF84B29DA9C341CDCF392933FE4B628437A47368",
"dividend": null,
"identities": [
"DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:1eubHHbuNfilHMM0G2bI30iZzebQ2cQ1PC7uPAw08FGMMmQCRerlF/3pc4sAcsnexsxBseA/3lY03KlONqJBAg==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:tic",
@@ -43,11 +43,11 @@
},
{
"version": 10,
- "nonce": 200000000001,
+ "nonce": 300000000001,
"number": 1,
"powMin": 0,
- "time": 1483622114,
- "medianTime": 1483614905,
+ "time": 1483977274,
+ "medianTime": 1483970065,
"membersCount": 2,
"monetaryMass": 0,
"unitbase": 0,
@@ -57,12 +57,12 @@
"len": 0,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "XHoAuJI0OfwA3/yCA2J9Q2u9Xvn/p6njXDz7Psi1v7ia1ibjH2mTB97odI8O7Mda2mVtyoVl4Un01cso1ww0Aw==",
- "hash": "7D6AE31DBD9EF372120ADEE5FA90DDD4EFACAE96B926BD54087E52641FC72BFC",
+ "signature": "cUx2yWePZnAL0V1f+ZgXvArJAhY4JSz79CfL7zj+T43rZNf/zNLWvDMrv4o/atXOmHQKOi2VFks8WLJzd2sgDA==",
+ "hash": "BAAD4C0F600C83BA806B48EFD9106446E767D0DFA8C5EAA2014901683F3CC61D",
"parameters": "",
- "previousHash": "0DCD782E25C04B3E77A7B5687893212AF0C8AE20687A13655D1068DA536FBF3E",
+ "previousHash": "CAEDB205C3B995922A78D167DD9A078312E6A169F8C3800F5060242D7A159751",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "0FD9B1D8BBB6EE37572668F6B5E5CB66A546BE4337E05B31C09FB71B39F36EC6",
+ "inner_hash": "650FDC31CBE8D6BED87C0E118A7D6FE5749152AB9C0B9025E9D4543E31BC797E",
"dividend": null,
"identities": [],
"joiners": [],
@@ -75,11 +75,11 @@
},
{
"version": 10,
- "nonce": 200000000001,
+ "nonce": 100000000001,
"number": 2,
"powMin": 0,
- "time": 1483622114,
- "medianTime": 1483618509,
+ "time": 1483977274,
+ "medianTime": 1483973669,
"membersCount": 2,
"monetaryMass": 240,
"unitbase": 0,
@@ -89,12 +89,12 @@
"len": 0,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "TkyydTsP5A5UZtn4URK7kSNUftdFDqP9Ma9DH36y1tfopvy5BUHtLc3Huz1eaiEJClfmNGh+LU5qxoSVmny3Bg==",
- "hash": "347E823BE5B446972B5A9ED162428AA247840FA695FBC125CC964F289453F17C",
+ "signature": "G3Z15ArGeoUrqSwaEJMbLTOxtHgrXnNZwbKCOksJohnQX0qsXaoUmz+fLTVqebt1x84cOd7brmyMT1VYTqMgAg==",
+ "hash": "5B506AEB491358614C9ED5C06214F62012250143A74745002CE289DD3DA1499E",
"parameters": "",
- "previousHash": "7D6AE31DBD9EF372120ADEE5FA90DDD4EFACAE96B926BD54087E52641FC72BFC",
+ "previousHash": "BAAD4C0F600C83BA806B48EFD9106446E767D0DFA8C5EAA2014901683F3CC61D",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "BBA373D017B83A8DAEE81FEC49E4A861AE624EE783B40554548595FB83C35409",
+ "inner_hash": "8644E2EE9E3571832B6CFB9FF89119884B7D05AEB809A19CB491B31466BB0E2C",
"dividend": 120,
"identities": [],
"joiners": [],
@@ -107,11 +107,11 @@
},
{
"version": 10,
- "nonce": 300000000001,
+ "nonce": 100000000001,
"number": 3,
"powMin": 0,
- "time": 1483622124,
- "medianTime": 1483619711,
+ "time": 1483977284,
+ "medianTime": 1483974871,
"membersCount": 2,
"monetaryMass": 240,
"unitbase": 0,
@@ -121,12 +121,12 @@
"len": 8,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "FsdVyz6yu/szV8U/yFrpCGBZADqfQmboOOt3QiNSqtVbVPzVXutYsz7o+mew+uQAP3cSrvMt8uSKD1InslunDw==",
- "hash": "4747B5BF56F8F582B01EE78C93470745175F1254868341F29569503C6AD3B7CA",
+ "signature": "f/Dhe87Mmf+KoUl0+GWrNA2g6QlSP0jP0z7U2ebcBNfvx6feBJVHbSoj95GPsNr4yxo7oJDd9iV/dAEyUK1OBg==",
+ "hash": "2C52F3391B43B0E7AA5370F1FA58DA7E97A835057805757BF27B0C1C400A0148",
"parameters": "",
- "previousHash": "347E823BE5B446972B5A9ED162428AA247840FA695FBC125CC964F289453F17C",
+ "previousHash": "5B506AEB491358614C9ED5C06214F62012250143A74745002CE289DD3DA1499E",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "F3AD9B713ABF6F30135F35EFF3210B2E0C85F17A129A455CA352C559B5F98A06",
+ "inner_hash": "7C9A44C18642D9B1A8972069E16739FAC64ED4D5E96BF0C1BD12616E050657A3",
"dividend": null,
"identities": [],
"joiners": [],
@@ -138,7 +138,7 @@
"transactions": [
{
"version": 10,
- "blockstamp": "2-347E823BE5B446972B5A9ED162428AA247840FA695FBC125CC964F289453F17C",
+ "blockstamp": "2-5B506AEB491358614C9ED5C06214F62012250143A74745002CE289DD3DA1499E",
"locktime": 0,
"issuers": [
"DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV"
@@ -155,22 +155,22 @@
],
"comments": [],
"signatures": [
- "5rfA0vIZ5nZ5VtpnVpc3BeDxPssaYTCNHsit4n9mxafTkRXhDNxLO/hDIwSz934xxsSdbYXdS1F4FrSy+ooDCA=="
+ "VnvnY4jKD+XqDLrhsoZ67z4Qr03ugwmaVIFwor2cMoAlTlxpFU4L/+e2oFaTpMal3wr/2VcHMFkf3DfiygJADg=="
],
"comment": "",
"currency": "duniter_unit_test_currency",
"block_number": 3,
- "time": 1483619711
+ "time": 1483974871
}
]
},
{
"version": 10,
- "nonce": 100000000001,
+ "nonce": 200000000001,
"number": 4,
"powMin": 0,
- "time": 1483620314,
- "medianTime": 1483620314,
+ "time": 1483975474,
+ "medianTime": 1483975474,
"membersCount": 2,
"monetaryMass": 240,
"unitbase": 0,
@@ -180,12 +180,12 @@
"len": 9,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "GGqAwEZmugRVfwEi4SjET+BtQkdcpoekL0noaqvNLXpt0n0DWBQNcbG4MBTQciQgZn9CTvjxXC1qohnlCkWOCQ==",
- "hash": "C30D95C66C7323780CD6D137EBF75ED9FE1A12B1E767D8CD982F1F30217418B5",
+ "signature": "mewLNlB1lbzulripYw5RXZF9+NY1rA1LLteRJJ4WCNbtSO2/zTOS1vJDhJHTyVKpeU92hUtCxmrb6qI/cV0pAA==",
+ "hash": "53CEBCF358C44862DEDD31F714749FD5D405041B1B57459676560E7B097B616F",
"parameters": "",
- "previousHash": "4747B5BF56F8F582B01EE78C93470745175F1254868341F29569503C6AD3B7CA",
+ "previousHash": "2C52F3391B43B0E7AA5370F1FA58DA7E97A835057805757BF27B0C1C400A0148",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "4F76233A54A34BA6EF33C96996B27C5A5FCA3F79567E9AE4E5C075B355050510",
+ "inner_hash": "4C5784AFDBBD77C19835690E1F0B990B6B41A8A265DC5F5E55BA640D372FDE83",
"dividend": null,
"identities": [],
"joiners": [],
@@ -197,14 +197,14 @@
"transactions": [
{
"version": 10,
- "blockstamp": "3-4747B5BF56F8F582B01EE78C93470745175F1254868341F29569503C6AD3B7CA",
+ "blockstamp": "3-2C52F3391B43B0E7AA5370F1FA58DA7E97A835057805757BF27B0C1C400A0148",
"locktime": 0,
"issuers": [
"DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo"
],
"inputs": [
"120:0:D:DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:2",
- "51:0:T:D77C05A6A346B58422DCAA779274F5F8D6D46F2DA9302BA257654183F055B366:0"
+ "51:0:T:3F8D6726BA783AF1136E9F25DE260A097A3B491FDBBD50A68FC1EB556FE96956:0"
],
"unlocks": [
"0:SIG(0)",
@@ -215,12 +215,12 @@
],
"comments": [],
"signatures": [
- "K0XrFWiI143TLzsrWM1m8U9ZnloR5d6T6jWq/oXqo3RqFn0FS+CX1F9FqqxM94zG499NRXRkuQteT1Gd5qg+Ag=="
+ "gunVyw4Vuceso5NvZJl8cwd0QSJug53mnEAT0v+3Mwfz7mE7tzZKrYwnCubQkgYI1FNp+wDd/G6e3T+BQsX0Bg=="
],
"comment": "",
"currency": "duniter_unit_test_currency",
"block_number": 4,
- "time": 1483620314
+ "time": 1483975474
}
]
},
@@ -229,8 +229,8 @@
"nonce": 100000000001,
"number": 5,
"powMin": 0,
- "time": 1483634744,
- "medianTime": 1483620314,
+ "time": 1483989904,
+ "medianTime": 1483975474,
"membersCount": 2,
"monetaryMass": 240,
"unitbase": 0,
@@ -240,12 +240,12 @@
"len": 0,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "G05LWsvjnGULgHW4qtLr+rqLsGIvnffwHTtdCMmlLU9gzLaoeCPKmVaPBMFOuhePb0Wil2nonGbQ9X7+J/3cAg==",
- "hash": "90F23DB9844EAB217EF0076F5B723D7CFBA4846F7CED42A1C7140DE048EF248A",
+ "signature": "D6S4lNuwDdhoqh9oixqYHIBcnnSBDhAt9e0/tct0z/lFKJ8OdB0hz2FHXx7XPU76cMEYxL4RLE9AnyslM8+rCg==",
+ "hash": "096B52435524FDE970C3F03D54BE7C94D1966B0050E781F7601991D68A828551",
"parameters": "",
- "previousHash": "C30D95C66C7323780CD6D137EBF75ED9FE1A12B1E767D8CD982F1F30217418B5",
+ "previousHash": "53CEBCF358C44862DEDD31F714749FD5D405041B1B57459676560E7B097B616F",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "B694ADC464A518972C5AB5DC6804252B40AD2D38D17CA999532953404948AFD0",
+ "inner_hash": "BC82EF017BC76FCF26FDFFC24FFEF92E207B1EC9C2971C3C567A118328FB0D79",
"dividend": null,
"identities": [],
"joiners": [],
@@ -258,11 +258,11 @@
},
{
"version": 10,
- "nonce": 300000000001,
+ "nonce": 100000000001,
"number": 6,
"powMin": 0,
- "time": 1483622719,
- "medianTime": 1483622719,
+ "time": 1483977879,
+ "medianTime": 1483977879,
"membersCount": 2,
"monetaryMass": 482,
"unitbase": 0,
@@ -272,12 +272,12 @@
"len": 0,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "41zb+6309w9D2dZ1xUBIA8VzDAO3bVLIa0I911ZHiD23YVUKpSqk3oPWWs+sTgYASv2kk+i5ygMyxixyQrEMCA==",
- "hash": "B6432A9F39B21B6A297F1C8784004FA58667E6CCBF8B6AF42621E6BABF25E375",
+ "signature": "JooERXZDZ1hCmS4LImX2R9txI6fGX5COS4JT4yYxTgPfBf2xSDEaNZ0g8Gkrxw2bMSeA/K8b1wS83YQDi+9hBQ==",
+ "hash": "D9BE62C77EAFAC96D28D38E71C06F02B6C302D2E679889F6D107F38F71E33841",
"parameters": "",
- "previousHash": "90F23DB9844EAB217EF0076F5B723D7CFBA4846F7CED42A1C7140DE048EF248A",
+ "previousHash": "096B52435524FDE970C3F03D54BE7C94D1966B0050E781F7601991D68A828551",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "C7DF18844F115B02776B0579D0358503812227D27AAE368F0E0FB06498C98268",
+ "inner_hash": "E3B8C442B0F305256CA9C9ACDF832669E25FF6EE6E3BD9706F9EC2C367A2AAF4",
"dividend": 121,
"identities": [],
"joiners": [],
@@ -293,8 +293,8 @@
"nonce": 200000000001,
"number": 7,
"powMin": 0,
- "time": 1483622719,
- "medianTime": 1483622719,
+ "time": 1483977879,
+ "medianTime": 1483977879,
"membersCount": 2,
"monetaryMass": 482,
"unitbase": 0,
@@ -304,12 +304,12 @@
"len": 7,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "qrncAMCOgoKQs+AVU6aA6lZRiwwmjyFFJ52huTOhUu03xGauGrA8vGt0N3tm7qEosLXwshGl3hx2L4yyG5YvDQ==",
- "hash": "2A8FB524A4533C48242421A9D4F397EA55349546049404FADE69C6377FF548D1",
+ "signature": "apWYTLEJyjJm8ggE2B4S6CbFad1Ch3TjYLFLfuLIpIs9wOY3ha4NuLlJu/d9g1dO86Xnl84KmoL/+4laDyaIDA==",
+ "hash": "AD83DE9C185699AF79BB14F83AC470407D35171129040E8B34C25893675225C0",
"parameters": "",
- "previousHash": "B6432A9F39B21B6A297F1C8784004FA58667E6CCBF8B6AF42621E6BABF25E375",
+ "previousHash": "D9BE62C77EAFAC96D28D38E71C06F02B6C302D2E679889F6D107F38F71E33841",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "BDF4F79493B49BE202AE4FC9A606FCDAD494799A5BABA21BBE3488D20FE2678E",
+ "inner_hash": "499B336E509305DF60014B7D4A3951806EEA1184C850FA68488B968495672C41",
"dividend": null,
"identities": [],
"joiners": [],
@@ -321,7 +321,7 @@
"transactions": [
{
"version": 10,
- "blockstamp": "6-B6432A9F39B21B6A297F1C8784004FA58667E6CCBF8B6AF42621E6BABF25E375",
+ "blockstamp": "6-D9BE62C77EAFAC96D28D38E71C06F02B6C302D2E679889F6D107F38F71E33841",
"locktime": 0,
"issuers": [
"DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo"
@@ -337,22 +337,22 @@
],
"comments": [],
"signatures": [
- "e7V8ZKethWnOoPmEBhD01fz/QIFtaSgHDf7Dz9OP97AWY41q/GuKUc1NuQXKATUJZ7Mh4qRtyq1+RCAkZIzgDA=="
+ "hCsFFk7xGDDWv0AP2DqxmJRRjziJT83ZCfXJq5jf9Vyw99PP+60u8ZsSksScbUGOtjuMkISWqg9VwY2bHfwyDw=="
],
"comment": "",
"currency": "duniter_unit_test_currency",
"block_number": 7,
- "time": 1483622719
+ "time": 1483977879
}
]
},
{
"version": 10,
- "nonce": 300000000001,
+ "nonce": 100000000001,
"number": 8,
"powMin": 0,
- "time": 1483622719,
- "medianTime": 1483622719,
+ "time": 1483977879,
+ "medianTime": 1483977879,
"membersCount": 2,
"monetaryMass": 482,
"unitbase": 0,
@@ -362,12 +362,12 @@
"len": 8,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "ZtV1UngKPYOJ5gwIQYjuFT8EilNJG7NVpyDosviRJ+9F5so/g9lGjF2i8DhVlCc8A0n9lW6Kio24XZsVykooCw==",
- "hash": "999A84F9BAE0C3067752A21779FB8F2401EB18CC3F7FF7550A95BB2DF5C3670A",
+ "signature": "djssjpSOuJPW0ze83lqHS/7aRQ7L7N2/XYR2O6OA+pJATrfHh6WRj2fByznM3Q2DWJzqRVqBkJxNxvXA3pjeBw==",
+ "hash": "E286600C0B91A7BC63949F3081FC2E5D5423ACD760DB61E8BC7D4E6697C48CEC",
"parameters": "",
- "previousHash": "2A8FB524A4533C48242421A9D4F397EA55349546049404FADE69C6377FF548D1",
+ "previousHash": "AD83DE9C185699AF79BB14F83AC470407D35171129040E8B34C25893675225C0",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "C75C356062DE5FB1ADC44F32412EB7A88F76D6F3C4FA78E47D2CAF6DEBEF4415",
+ "inner_hash": "1501C49E7F5D3974893677214426ED8D9DA3560E0256AB48B1412B7A81394C09",
"dividend": null,
"identities": [],
"joiners": [],
@@ -379,13 +379,13 @@
"transactions": [
{
"version": 10,
- "blockstamp": "7-2A8FB524A4533C48242421A9D4F397EA55349546049404FADE69C6377FF548D1",
+ "blockstamp": "7-AD83DE9C185699AF79BB14F83AC470407D35171129040E8B34C25893675225C0",
"locktime": 0,
"issuers": [
"DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV"
],
"inputs": [
- "121:0:T:D54DF2479C4BF0D7E756F204AA7BC38F0C143EDDDC92DF9645BA031138E0477D:0"
+ "121:0:T:E625C9976FDC3C1B5DE12C7D8B1230B3B45656443CE14B7CB025AA285932F9CB:0"
],
"unlocks": [
"0:SIG(0)"
@@ -397,12 +397,12 @@
"ok"
],
"signatures": [
- "CZ/PTKvdeIeh2Tcg+lcMO6V1wkVzHgEY2KYkIkdNv9o8R9Iq7QedyT6chbG7Qv55TJD8LCijIuutSmsgz5IMBg=="
+ "RHy+IFdIUqZpLGIjiPSWWM1y102KKS8SJ2EReXpvb0m6bY7xgBUM9f3Wq3oBHUUjp0oj+MJXmBfCHpoMN18zDQ=="
],
"comment": "ok",
"currency": "duniter_unit_test_currency",
"block_number": 8,
- "time": 1483622719
+ "time": 1483977879
}
]
},
@@ -411,8 +411,8 @@
"nonce": 100000000001,
"number": 9,
"powMin": 0,
- "time": 1483622719,
- "medianTime": 1483622719,
+ "time": 1483977879,
+ "medianTime": 1483977879,
"membersCount": 2,
"monetaryMass": 482,
"unitbase": 0,
@@ -422,12 +422,12 @@
"len": 8,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "ZS8SZvAPwV+lzJIB9lzhXKbezvf2zYuqESorhi7hm5+h54gHVE1VdHq8kWqK8254e/E4+DBYGyUtmqkSzjp4DQ==",
- "hash": "B087B0B7CF881355D0881BE61170168EBC0EAAA2640CD9119EDDCAFA6ED0D72B",
+ "signature": "8N3YT1DJEXVfyMBxYagkVvI2llzPk6CMgBDIiuD3ZBPCbWIrpYGpfwQ6N6AG6Dc5dWh2xEV5P9RAQY+zFijECA==",
+ "hash": "EE55B59D8415A02D4B6062627A5654A5BEDAA2DDF9F75A309BB0E9B96A9A9E64",
"parameters": "",
- "previousHash": "999A84F9BAE0C3067752A21779FB8F2401EB18CC3F7FF7550A95BB2DF5C3670A",
+ "previousHash": "E286600C0B91A7BC63949F3081FC2E5D5423ACD760DB61E8BC7D4E6697C48CEC",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "B712970F21A1297D04755240C083533448E17381763A9789B23E7A8A80E1F3F8",
+ "inner_hash": "C31343A0A0644ACA65DD9C4EA4BA707EFC66AD2D84A92D918082A9800A6338D2",
"dividend": null,
"identities": [],
"joiners": [],
@@ -439,13 +439,13 @@
"transactions": [
{
"version": 10,
- "blockstamp": "7-2A8FB524A4533C48242421A9D4F397EA55349546049404FADE69C6377FF548D1",
+ "blockstamp": "7-AD83DE9C185699AF79BB14F83AC470407D35171129040E8B34C25893675225C0",
"locktime": 0,
"issuers": [
"DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV"
],
"inputs": [
- "121:0:T:5F779C409D291EC24D496703012EC703CCD5D4A1E3FC6977AD7FC6A17CBBB51A:0"
+ "121:0:T:68BC9CC4D6B5238671492D4863D174346B60389B3EB721F61116CDFDD38C6BFF:0"
],
"unlocks": [
"0:XHX(1872767826647264)"
@@ -457,12 +457,12 @@
"okk"
],
"signatures": [
- "0c6KHlaFOr7tzpMeh6cNWeM4u3CP6tq4n/8RU/lgCANqGieylYNi1l/rI6swaPR0+VveEME6TXxttckLHHchBg=="
+ "GGhRugcizcjQ7yAv9LJGTkpJ6dr24gitAaV3nsOTIRONuBlzkwj6lff0BbjwdYc4QRlymL6Xnfc5M6G1XeDcCQ=="
],
"comment": "okk",
"currency": "duniter_unit_test_currency",
"block_number": 9,
- "time": 1483622719
+ "time": 1483977879
}
]
},
@@ -471,8 +471,8 @@
"nonce": 100000000001,
"number": 10,
"powMin": 1,
- "time": 1483622719,
- "medianTime": 1483622719,
+ "time": 1483977879,
+ "medianTime": 1483977879,
"membersCount": 2,
"monetaryMass": 482,
"unitbase": 0,
@@ -482,12 +482,12 @@
"len": 7,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "W6cestg9fjh6pG3jXz9N3j1BMd5urpOTI/PjcC5Z6bqIOw33d82XYYTudz6g49wBTA8ux/3bgdMh0Vu37dKsBw==",
- "hash": "26B57CF37334A136A8BBC801C9163E3A769A8F2FBB4497DD5CDA39369DC89952",
+ "signature": "lqdeL3H5fqxg/oPbmeIcw2FDlfYLzaPEwwkymlj+W1HSR5ZjS8V5UGKgJS+b16AE614FT4wBxf7bgbMPi/4MCw==",
+ "hash": "37D397CCC32887BBD63BE1CCB0D3CB234E02F3B21792D59D9239D2F0C883C6A6",
"parameters": "",
- "previousHash": "B087B0B7CF881355D0881BE61170168EBC0EAAA2640CD9119EDDCAFA6ED0D72B",
+ "previousHash": "EE55B59D8415A02D4B6062627A5654A5BEDAA2DDF9F75A309BB0E9B96A9A9E64",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "BD4C859BB6BDA4F738D7913026CC65EFAE1FAFAF8580FB3DF8811F9830528B41",
+ "inner_hash": "6AE9E4A7309704A00485C347CCC844197477107D295B120333185F609A2FE8B3",
"dividend": null,
"identities": [],
"joiners": [],
@@ -499,13 +499,13 @@
"transactions": [
{
"version": 10,
- "blockstamp": "9-B087B0B7CF881355D0881BE61170168EBC0EAAA2640CD9119EDDCAFA6ED0D72B",
+ "blockstamp": "9-EE55B59D8415A02D4B6062627A5654A5BEDAA2DDF9F75A309BB0E9B96A9A9E64",
"locktime": 0,
"issuers": [
"DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo"
],
"inputs": [
- "121:0:T:740955FB8D22AFB1E41B8F7F15CEE6082AFA45A138FE528A73ADB0B8761C6EEF:0"
+ "121:0:T:46DCF9F9448E86434D41477881BFEE5C154B121DE9F6524D304C1F2D261CC066:0"
],
"unlocks": [
"0:SIG(0)"
@@ -515,12 +515,12 @@
],
"comments": [],
"signatures": [
- "y4/kUzik/gqJuangJfSFJoX3pQS4l3qwnstT54I9YQl2G2i3A8EL6mWp4PYweLFKGBTrguhPKnM2moySWxslBw=="
+ "IODsd3oOGj90zZNvrEJ9CSJnnDGQFcOY+UuP4xWK/Iad54V8EP2EzgCnPuydaKJrzem/LqlZDdIXfRLXAnYSDQ=="
],
"comment": "",
"currency": "duniter_unit_test_currency",
"block_number": 10,
- "time": 1483622719
+ "time": 1483977879
}
]
},
@@ -529,8 +529,8 @@
"nonce": 100000000001,
"number": 11,
"powMin": 1,
- "time": 1483622719,
- "medianTime": 1483622719,
+ "time": 1483977879,
+ "medianTime": 1483977879,
"membersCount": 2,
"monetaryMass": 482,
"unitbase": 0,
@@ -540,12 +540,12 @@
"len": 8,
"currency": "duniter_unit_test_currency",
"issuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "signature": "97buQfxPg8ONEzLyBtlOGjXhhUft4TfJoXZkG/1Ou1KSj9R42On070cZjULH2cmheaX0ebjsKThEvQdFwlEfDQ==",
- "hash": "2507D9FEFA73351D5FA79B3F0FB8450869AD40DA3986F8DAB6BD087169DC0C9E",
+ "signature": "eyFqgSzUsCECDvkgkh/DX7qVJ3OKq86mR4vgQrXeHuynlLJ+HXMSnX5wnQ2csbOgpYUHzWlRTwm0mGQInKoCBQ==",
+ "hash": "CF191C963B47F2BA6CD11ECEF2374C0052E863D73B5E59487A7C3E46EE19B6BE",
"parameters": "",
- "previousHash": "26B57CF37334A136A8BBC801C9163E3A769A8F2FBB4497DD5CDA39369DC89952",
+ "previousHash": "37D397CCC32887BBD63BE1CCB0D3CB234E02F3B21792D59D9239D2F0C883C6A6",
"previousIssuer": "DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV",
- "inner_hash": "463A572E9304858E241C43C83722C44552EE3984B637546F3DD2415CFB34BECC",
+ "inner_hash": "26126CD22C10AA988D1B04D1D826BFAF31B05CC209CEB97C01D33B0EE436635A",
"dividend": null,
"identities": [],
"joiners": [],
@@ -557,13 +557,13 @@
"transactions": [
{
"version": 10,
- "blockstamp": "10-26B57CF37334A136A8BBC801C9163E3A769A8F2FBB4497DD5CDA39369DC89952",
+ "blockstamp": "10-37D397CCC32887BBD63BE1CCB0D3CB234E02F3B21792D59D9239D2F0C883C6A6",
"locktime": 0,
"issuers": [
"DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV"
],
"inputs": [
- "121:0:T:230712F5F850602D2C0ACF26A7F60F791DFA9873A5E8B8374EE87938AD995EE5:0"
+ "121:0:T:E9BCB40174140FF58037FC2D9AD51E0D3EA67FB19FE4D6D50E39BF5442E73103:0"
],
"unlocks": [
"0:SIG(0)"
@@ -575,12 +575,12 @@
"cross1"
],
"signatures": [
- "YLxw8AB+uVeLIMB2IWIOWGVvVRmnsYgl100vbPzNM+lfDU4wnmaftmoh8pMZzGjGUSBPSinIBvdJrVXZslymAA=="
+ "Ify7JqbxdqBO/CwVVlFAgVXphUL9W8imqKmdy4rBUx7T/WgLuowuhGe+8UlO0cEFZlZhXA2eGw19XSzErNawBg=="
],
"comment": "cross1",
"currency": "duniter_unit_test_currency",
"block_number": 11,
- "time": 1483622719
+ "time": 1483977879
}
]
}
diff --git a/test/data/blocks.js b/test/data/blocks.js
index 15d991f9a577c826551fc454ef935dc04390cfda..fef13d0da5b7bf13cb63d81ef76a2daafc118dd2 100644
--- a/test/data/blocks.js
+++ b/test/data/blocks.js
@@ -50,7 +50,7 @@ module.exports = {
"IssuersFrame: 1\n" +
"IssuersFrameVar: 0\n" +
"DifferentIssuersCount: 0\n" +
- "Parameters: 0.007376575:3600:120:0:40:604800:31536000:1:604800:604800:0.9:31536000:3:20:960:10:20:0.6666666666666666\n" +
+ "Parameters: 0.007376575:3600:120:0:40:604800:31536000:1:604800:604800:0.9:31536000:3:20:960:10:0.6666666666666666\n" +
"MembersCount: 2\n" +
"Identities:\n" +
"DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:1eubHHbuNfilHMM0G2bI30iZzebQ2cQ1PC7uPAw08FGMMmQCRerlF/3pc4sAcsnexsxBseA/3lY03KlONqJBAg==:0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855:tic\n" +
@@ -66,7 +66,7 @@ module.exports = {
"DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:0:vMaYgBSnU+83AYOVQCZAx1XLpg/F1MmMztDfCnZvl8hPs4LE9tcDvCrrFogAwMEW2N7Y0gCH62/fBMgw4KrGCA==\n" +
"DNann1Lh55eZMEDXeYt59bzHbA3NJR46DeQYCS2qQdLV:DKpQPUL4ckzXYdnDRvCRKAm1gNvSdmAXnTrJZ7LvM5Qo:0:RKIGMgYIhB9FmjPbmyo4egPufg/iTpBznYGZp5hjK1WZ1a9imQldLNUMe0eiPlSKJTK/JD3gOlCiynOEY2csBA==\n" +
"Transactions:\n" +
- "InnerHash: 3969BE7A32853B2AB526662E88A2F1BFD852048C6B1DAEF0483F3DF64757AF48\n" +
+ "InnerHash: 85EAAFF16565A526F5E7DD2E75E91F2D87BBD00BE30FBC2081BC855F76C93AFB\n" +
"Nonce: 300000000001\n" +
"WJourHkd6NnMxKDSEfrsiB7qE0mGbiFHSwy0cE8/q/is6hTd0mzlMNBPxDhoPkAiocfXJrQuIVeG0/ygxQrTBw==\n",
@@ -147,7 +147,7 @@ module.exports = {
"IssuersFrame: 100\n" +
"IssuersFrameVar: 0\n" +
"DifferentIssuersCount: 3\n" +
- "Parameters: 0.7376575:100:157680000:0:40:7200:31536000:1:1000:1000:0.9:31536000:3:1:60:10:20:0.67\n" +
+ "Parameters: 0.7376575:100:157680000:0:40:7200:31536000:1:1000:1000:0.9:31536000:3:1:60:10:0.67\n" +
"MembersCount: 3\n" +
"Identities:\n" +
"Joiners:\n" +
diff --git a/test/integration/proof-of-work.js b/test/integration/proof-of-work.js
index c7769636bfac78afdd2bdd6ee2531f84dae9665c..472ddd4e18fb7112eb54a6d0540f375c78044445 100644
--- a/test/integration/proof-of-work.js
+++ b/test/integration/proof-of-work.js
@@ -69,59 +69,60 @@ describe("Proof-of-work", function() {
]);
}));
- it('should be able to cancel a proof-of-work on other PoW receival', () => co(function*() {
- const now = 1474464489;
- const res = yield toolbox.simpleNetworkOf2NodesAnd2Users({
- powMin: 46
- }), s1 = res.s1, s2 = res.s2;
- yield s1.commit({
- time: now // 38 hits to find the proof (known by test)
- });
- yield s2.until('block', 1);
- yield s1.expectJSON('/blockchain/current', { number: 0 });
- yield s2.expectJSON('/blockchain/current', { number: 0 });
- yield s1.commit({
- time: now + 13 // 521 hits to find the proof
- });
- yield s2.until('block', 1);
- yield s1.expectJSON('/blockchain/current', { number: 1 });
- yield s2.expectJSON('/blockchain/current', { number: 1 });
- s1.conf.cpu = 1.0;
- s2.conf.cpu = 0.02;
- yield Promise.all([
-
- // Make a concurrent trial
- Promise.all([
- co(function*() {
- try {
- let s2commit = s2.commit({ time: now + 14 }); // 7320 hits to be found: very high, that's good because we need time for s1 to find the proof *before* s2
- // A little handicap for s1 which will find the proof almost immediately
- setTimeout(() => s1.commit({ time: now + 10 }), 100);
- yield s2commit;
- throw 's2 server should not have found the proof before s1';
- } catch (e) {
- should.exist(e);
- e.should.equal('Proof-of-work computation canceled because block received');
- }
- })
- ]),
-
- // We wait until both nodes received the new block
- s1.until('block', 1),
- s2.until('block', 1)
- ]);
- yield s1.expectJSON('/blockchain/current', { number: 2 });
- yield s2.expectJSON('/blockchain/current', { number: 2 });
- // Both nodes should receive the same last block from s2
- s2.conf.cpu = 1.0;
- yield [
- s1.until('block', 1),
- s2.until('block', 1),
- s2.commit({ time: now + 10 })
- ];
- yield s1.expectJSON('/blockchain/current', { number: 3 });
- yield s2.expectJSON('/blockchain/current', { number: 3 });
- }));
+ // Too randomly successing test
+ // it('should be able to cancel a proof-of-work on other PoW receival', () => co(function*() {
+ // const now = 1474464489;
+ // const res = yield toolbox.simpleNetworkOf2NodesAnd2Users({
+ // powMin: 46
+ // }), s1 = res.s1, s2 = res.s2;
+ // yield s1.commit({
+ // time: now // 38 hits to find the proof (known by test)
+ // });
+ // yield s2.until('block', 1);
+ // yield s1.expectJSON('/blockchain/current', { number: 0 });
+ // yield s2.expectJSON('/blockchain/current', { number: 0 });
+ // yield s1.commit({
+ // time: now + 13 // 521 hits to find the proof
+ // });
+ // yield s2.until('block', 1);
+ // yield s1.expectJSON('/blockchain/current', { number: 1 });
+ // yield s2.expectJSON('/blockchain/current', { number: 1 });
+ // s1.conf.cpu = 1.0;
+ // s2.conf.cpu = 0.02;
+ // yield Promise.all([
+ //
+ // // Make a concurrent trial
+ // Promise.all([
+ // co(function*() {
+ // try {
+ // let s2commit = s2.commit({ time: now + 14 }); // 7320 hits to be found: very high, that's good because we need time for s1 to find the proof *before* s2
+ // // A little handicap for s1 which will find the proof almost immediately
+ // setTimeout(() => s1.commit({ time: now + 10 }), 100);
+ // yield s2commit;
+ // throw 's2 server should not have found the proof before s1';
+ // } catch (e) {
+ // should.exist(e);
+ // e.should.equal('Proof-of-work computation canceled because block received');
+ // }
+ // })
+ // ]),
+ //
+ // // We wait until both nodes received the new block
+ // s1.until('block', 1),
+ // s2.until('block', 1)
+ // ]);
+ // yield s1.expectJSON('/blockchain/current', { number: 2 });
+ // yield s2.expectJSON('/blockchain/current', { number: 2 });
+ // // Both nodes should receive the same last block from s2
+ // s2.conf.cpu = 1.0;
+ // yield [
+ // s1.until('block', 1),
+ // s2.until('block', 1),
+ // s2.commit({ time: now + 10 })
+ // ];
+ // yield s1.expectJSON('/blockchain/current', { number: 3 });
+ // yield s2.expectJSON('/blockchain/current', { number: 3 });
+ // }));
it('should be able to cancel a waiting on other PoW receival', () => co(function*() {
const now = 1474464481;