diff --git a/doc/manual-config.md b/doc/manual-config.md index b8dd1b35f49d0dfa4b9ed4f515826a5cd4f4de5b..90282120fc1ce4915e8c05f4479e2518f7212747 100644 --- a/doc/manual-config.md +++ b/doc/manual-config.md @@ -19,7 +19,7 @@ Replace `mycurrency` by the name of the currency you want to manage. ## Network parameters -By default, ucoin runs on port 8033. You may change it using the --port parameter: +By default, duniter runs on port 8033. You may change it using the --port parameter: ```bash $ duniter config --port 80 @@ -60,9 +60,9 @@ Note too that listening to multiple interfaces doesn't imply mutiple program ins ### Peering informations -Duniter protocol uses peering mecanisms, hence needs any ucoin node to be reachable through the network. +Duniter protocol uses peering mecanisms, hence needs any duniter node to be reachable through the network. -As the server may be behind a reverse proxy, or because hosts may change of address, remote informations are likely to be different from listening host and port parameters. ucoin software defines 4 remote parameters you need to precise for your ucoin instance to be working: +As the server may be behind a reverse proxy, or because hosts may change of address, remote informations are likely to be different from listening host and port parameters. duniter software defines 4 remote parameters you need to precise for your duniter instance to be working: * `--remoteh` * `--remote4` diff --git a/test/fast/peering.js b/test/fast/peering.js index e6ec6d75bb9fb17ed311e4eed22257fe07feee72..2bfb93ea8fe79db03eb0bec71b18a8f229ad6795 100644 --- a/test/fast/peering.js +++ b/test/fast/peering.js @@ -10,7 +10,7 @@ var rawPeer = "" + "PublicKey: 3Z7w5g4gC9oxwEbATnmK2UFgGWhLZPmZQb5dRxvNrXDu\n" + "Block: 0-E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855\n" + "Endpoints:\n" + - "BASIC_MERKLED_API ucoin.twiced.fr 88.163.127.43 9101\n" + + "BASIC_MERKLED_API duniter.twiced.fr 88.163.127.43 9101\n" + "OTHER_PROTOCOL 88.163.127.43 9102\n" + "bvuKzc6+cGWMGC8FIkZHN8kdQhaRL/MK60KYyw5vJqkKEgxXbygQHAzfoojeSY4gPKIu4FggBkR1HndSEm2FAQ==\n"; @@ -44,7 +44,7 @@ describe('Peer', function(){ }); it('should have DNS', function(){ - assert.equal(pr.getDns(), 'ucoin.twiced.fr'); + assert.equal(pr.getDns(), 'duniter.twiced.fr'); }); it('should have IPv4', function(){ diff --git a/test/integration/branches2.js b/test/integration/branches2.js index 56236c3c4e04cbe1002160306dce6c1e11bfa07c..6832914c97d679f247985f26cb05b3361db67500 100644 --- a/test/integration/branches2.js +++ b/test/integration/branches2.js @@ -2,7 +2,7 @@ const co = require('co'); const _ = require('underscore'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const constants = require('../../app/lib/constants'); @@ -29,7 +29,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( '/bb4', MEMORY_MODE, _.extend({ @@ -40,7 +40,7 @@ const s1 = ucoin( } }, commonConf)); -const s2 = ucoin( +const s2 = duniter( '/bb5', MEMORY_MODE, _.extend({ diff --git a/test/integration/branches_revert2.js b/test/integration/branches_revert2.js index b5f9544528175f1c9b543644627dfa11183de836..3151b1bcf95dfd680b6cb329eb7f77e09d1e21d9 100644 --- a/test/integration/branches_revert2.js +++ b/test/integration/branches_revert2.js @@ -2,7 +2,7 @@ const co = require('co'); const _ = require('underscore'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const rp = require('request-promise'); @@ -23,7 +23,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( '/bb11', MEMORY_MODE, _.extend({ diff --git a/test/integration/branches_switch.js b/test/integration/branches_switch.js index 20cd0717a4675386c55fc21970bae0f0f149d309..d476845cbcff029371b91f8fb9221352c79041da 100644 --- a/test/integration/branches_switch.js +++ b/test/integration/branches_switch.js @@ -2,7 +2,7 @@ const co = require('co'); const _ = require('underscore'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const rp = require('request-promise'); @@ -24,7 +24,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( '/bb11', MEMORY_MODE, _.extend({ @@ -37,7 +37,7 @@ const s1 = ucoin( sigQty: 1, dt: 1, ud0: 120 }, commonConf)); -const s2 = ucoin( +const s2 = duniter( '/bb12', MEMORY_MODE, _.extend({ diff --git a/test/integration/certification_chainability.js b/test/integration/certification_chainability.js index 2f44538c2f155752119f0a9a7c1b1f71a2282184..aa07c463ad109c62af2bae0afea9919202b50432 100644 --- a/test/integration/certification_chainability.js +++ b/test/integration/certification_chainability.js @@ -3,7 +3,7 @@ const _ = require('underscore'); const co = require('co'); const should = require('should'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const constants = require('../../app/lib/constants'); @@ -24,7 +24,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( '/bb11', MEMORY_MODE, _.extend({ diff --git a/test/integration/collapse.js b/test/integration/collapse.js index 052eb154f8204a053890168d2ac79f7bc6966b89..a6b9a105ab60277e71a75a5e6f3dd99cd4e4383e 100644 --- a/test/integration/collapse.js +++ b/test/integration/collapse.js @@ -2,7 +2,7 @@ const co = require('co'); const _ = require('underscore'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const commit = require('./tools/commit'); @@ -19,7 +19,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( '/bb11', MEMORY_MODE, _.extend({ diff --git a/test/integration/http_api.js b/test/integration/http_api.js index 2bbd44aef1727019f126e34fcd6376118912fb93..cddfebd3718e4dd437a58bcb362c6196dee4120c 100644 --- a/test/integration/http_api.js +++ b/test/integration/http_api.js @@ -4,7 +4,7 @@ const co = require('co'); const _ = require('underscore'); const should = require('should'); const assert = require('assert'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const http = require('./tools/http'); @@ -12,7 +12,7 @@ const constants = require('../../app/lib/constants'); const rp = require('request-promise'); const ws = require('ws'); -const server = ucoin( +const server = duniter( '/bb11', true, { diff --git a/test/integration/identity-absorption.js b/test/integration/identity-absorption.js index da01fb2f3734e21b777958456195cd606b2712fd..8fcbf8adeaba4e5530154caab9fa6c01d9191e75 100644 --- a/test/integration/identity-absorption.js +++ b/test/integration/identity-absorption.js @@ -2,7 +2,7 @@ const _ = require('underscore'); const co = require('co'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const rp = require('request-promise'); @@ -22,7 +22,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( '/bb12', MEMORY_MODE, _.extend({ @@ -33,7 +33,7 @@ const s1 = ucoin( } }, commonConf)); -const s2 = ucoin( +const s2 = duniter( '/bb12', MEMORY_MODE, _.extend({ diff --git a/test/integration/identity-clean-test.js b/test/integration/identity-clean-test.js index 248ba1d1f223564cc6fcab460929f50c43e0a45d..0c9651fe0e84df545f8a3830e8f25578b69fd3ca 100644 --- a/test/integration/identity-clean-test.js +++ b/test/integration/identity-clean-test.js @@ -2,7 +2,7 @@ const _ = require('underscore'); const co = require('co'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const rp = require('request-promise'); @@ -23,7 +23,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( '/bb12', MEMORY_MODE, _.extend({ diff --git a/test/integration/identity-test.js b/test/integration/identity-test.js index 736eeef25ac4ff2dece1b3ebece9736b5a3db27f..85f8df0b6d8723402a95f693edf0afbf6ab75202 100644 --- a/test/integration/identity-test.js +++ b/test/integration/identity-test.js @@ -3,7 +3,7 @@ const _ = require('underscore'); const co = require('co'); const should = require('should'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const constants = require('../../app/lib/constants'); @@ -28,7 +28,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( '/bb11', MEMORY_MODE, _.extend({ diff --git a/test/integration/lookup.js b/test/integration/lookup.js index a7d43182061294902177dd6ffa4313796d384e2c..c30dcc477a5c094353434623c696ce60867bd8fc 100644 --- a/test/integration/lookup.js +++ b/test/integration/lookup.js @@ -2,7 +2,7 @@ const _ = require('underscore'); const co = require('co'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const rp = require('request-promise'); @@ -14,7 +14,7 @@ const commonConf = { currency: 'bb' }; -const s1 = ucoin( +const s1 = duniter( 'bb12', MEMORY_MODE, _.extend({ diff --git a/test/integration/peerings.js b/test/integration/peerings.js index c87840d4b0367578dc16858e1f05c69ba44ec08d..39c0e08f41bf93b416a2e93eee80fa2c81450980 100644 --- a/test/integration/peerings.js +++ b/test/integration/peerings.js @@ -4,7 +4,7 @@ const co = require('co'); const Q = require('q'); const _ = require('underscore'); const should = require('should'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const constants = require('../../app/lib/constants'); @@ -30,7 +30,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( 'bb_net1', MEMORY_MODE, _.extend({ @@ -41,7 +41,7 @@ const s1 = ucoin( } }, commonConf)); -const s2 = ucoin( +const s2 = duniter( 'bb_net2', MEMORY_MODE, _.extend({ @@ -52,7 +52,7 @@ const s2 = ucoin( } }, commonConf)); -const s3 = ucoin( +const s3 = duniter( 'bb_net3', MEMORY_MODE, _.extend({ diff --git a/test/integration/start_generate_blocks.js b/test/integration/start_generate_blocks.js index 28a8daa196b0c5bb7ab9776befc53aa715701142..ab6bddebcfc2f7bddc19c1b08b2b8cffff44b494 100644 --- a/test/integration/start_generate_blocks.js +++ b/test/integration/start_generate_blocks.js @@ -2,7 +2,7 @@ const co = require('co'); const _ = require('underscore'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const rp = require('request-promise'); @@ -26,7 +26,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( '/bb7', MEMORY_MODE, _.extend({ @@ -39,7 +39,7 @@ const s1 = ucoin( participate: true // TODO: to remove when startGeneration will be an explicit call }, commonConf)); -const s2 = ucoin( +const s2 = duniter( '/bb7_2', MEMORY_MODE, _.extend({ diff --git a/test/integration/tests.js b/test/integration/tests.js index a6abb254bed3677ffb2528816d467f8a6551a316..3237032f8bbdac69ec5a9242c9f66db130a924ae 100644 --- a/test/integration/tests.js +++ b/test/integration/tests.js @@ -7,7 +7,7 @@ const assert = require('assert'); const bma = require('../../app/lib/streams/bma'); const constants = require('../../app/lib/constants'); const node = require('./tools/node'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const user = require('./tools/user'); const jspckg = require('../../package'); const commit = require('./tools/commit'); @@ -172,7 +172,7 @@ describe("Integration", function() { describe("Testing leavers", function(){ - const node3 = ucoin('/db3', MEMORY_MODE, { + const node3 = duniter('/db3', MEMORY_MODE, { currency: 'dd', ipv4: 'localhost', port: 9997, remoteipv4: 'localhost', remoteport: 9997, upnp: false, httplogs: false, salt: 'abc', passwd: 'abc', participate: false, rootoffset: 0, sigQty: 1, sigPeriod: 0 diff --git a/test/integration/tools/node.js b/test/integration/tools/node.js index 11525a7e470efa945117cece73e261147df027f4..7afe80f9d3c7bc813b09742968a3f927d4b565ce 100644 --- a/test/integration/tools/node.js +++ b/test/integration/tools/node.js @@ -7,7 +7,7 @@ var async = require('async'); var request = require('request'); var rules = require('../../../app/lib/rules'); var contacter = require('../../../app/lib/contacter'); -var ucoin = require('../../../index'); +var duniter = require('../../../index'); var multicaster = require('../../../app/lib/streams/multicaster'); var Configuration = require('../../../app/lib/entity/configuration'); var Peer = require('../../../app/lib/entity/peer'); @@ -222,7 +222,7 @@ function Node (dbName, options) { function service(callback) { return function () { var cbArgs = arguments; - var server = ucoin('/' + dbName, true, Configuration.statics.complete(options)); + var server = duniter('/' + dbName, true, Configuration.statics.complete(options)); // Initialize server (db connection, ...) return co(function*(){ diff --git a/test/integration/wotb.js b/test/integration/wotb.js index 61a424a7bad256e27481360020723f52f117c37f..a4492fccfb38fee75fc610c1d655008bb3ff0ee1 100644 --- a/test/integration/wotb.js +++ b/test/integration/wotb.js @@ -3,7 +3,7 @@ const co = require('co'); const should = require('should'); const _ = require('underscore'); -const ucoin = require('../../index'); +const duniter = require('../../index'); const bma = require('../../app/lib/streams/bma'); const user = require('./tools/user'); const commit = require('./tools/commit'); @@ -18,7 +18,7 @@ const commonConf = { sigQty: 1 }; -const s1 = ucoin( +const s1 = duniter( '/bb11', MEMORY_MODE, _.extend({ @@ -31,7 +31,7 @@ const s1 = ucoin( sigQty: 1, dt: 1, ud0: 120 }, commonConf)); -const s2 = ucoin( +const s2 = duniter( '/bb41', MEMORY_MODE, _.extend({ @@ -45,7 +45,7 @@ const s2 = ucoin( msValidity: 400 // Memberships expire after 400 second delay }, commonConf)); -const s3 = ucoin( +const s3 = duniter( '/bb11', MEMORY_MODE, _.extend({