Rewrite peers module - #409 #441

4miners · 2017-02-17T12:20:48Z

No description provided.

…/lisk into 409_rewrite-peers-module

…09_rewrite-peers-module

…minism

…_rewrite-peers-module

4miners · 2017-02-17T12:31:29Z

package.json

@@ -40,6 +40,7 @@
    "semver": "=5.3.0",
    "socket.io": "=1.4.8",
    "sodium": "LiskHQ/node-sodium#07ba174",
+    "steed": "=1.1.3",


Not needed.

4miners · 2017-02-17T12:32:25Z

app.js

 			scope.bus.message('bind', scope.modules);
+			scope.logic.peers.bind(scope);


Expose modules and library to logic.peers

…/lisk into 409_rewrite-peers-module

4miners · 2017-02-17T12:35:51Z

modules/peers.js

 var Router = require('../helpers/router.js');
 var sandboxHelper = require('../helpers/sandbox.js');
 var schema = require('../schema/peers.js');
+var async = require('async');


Should be sorted.

4miners · 2017-02-17T12:37:55Z

modules/peers.js

+	var updated = 0;
+	library.logger.trace('Importing peers from database');
+	library.db.any(sql.getAll).then(function (rows) {
+		library.logger.trace('Imported peers from database', {count: rows.length});


Should be info level

4miners · 2017-02-17T12:39:51Z

modules/peers.js

+		return t.batch(queries);
+	})
+	.then(function (data) {
+		library.logger.debug('Peers exported to database');


Should be info level

4miners · 2017-02-17T12:40:21Z

modules/peers.js

+		return peer.ip === pip && peer.port === port;
+	});
+	if (frozenPeer) {
+		//FIXME: Keeping peer frozen is bad idea at all


I'm still not sure here

4miners · 2017-02-17T12:42:15Z

modules/peers.js

 		var consensus = Math.round(options.matched / peers.length * 100 * 1e2) / 1e2;
-		    consensus = isNaN(consensus) ? 0 : consensus;
+			consensus = isNaN(consensus) ? 0 : consensus;


intendation

4miners · 2017-02-17T12:44:03Z

modules/transport.js


 		req.sanitize(headers, schema.headers, function (err, report) {
-			if (err) { return next(err); }


We will never have err here, so no need to check for

4miners · 2017-02-17T12:44:25Z

modules/transport.js

@@ -245,6 +244,12 @@ __private.attachApi = function () {
 		});
 	});

+	router.get('/ping', function (req, res) {


New endpoint, experimental ;)

4miners · 2017-02-17T12:45:10Z

modules/transport.js

@@ -348,12 +353,12 @@ __private.banPeer = function (options) {
 		library.logger.trace('Peer ban skipped', {options: options});
 		return false;
 	}
-	library.logger.warn([options.code, ['Ban', options.peer.string, (options.clock / 60), 'minutes'].join(' '), options.req.method, options.req.url].join(' '));
-	modules.peers.state(options.peer.ip, options.peer.port, 0, options.clock);
+	library.logger.debug([options.code, ['Ban', options.peer.string, (options.clock / 60), 'minutes'].join(' '), options.req.method, options.req.url].join(' '));


Changeg to debug level because it's not so important

MaciejBaj · 2017-02-20T13:58:39Z

logic/peers.js

+
+// Public methods
+Peers.prototype.bind = function (scope) {
+	modules = scope.modules;


also modules are not used anywhere here as far

Yes, I left support for that for future usage. Maybe we should move some other functions from modules/peers.js to logic.

MaciejBaj · 2017-02-20T16:15:43Z

logic/peers.js

+};
+
+Peers.prototype.ban = function (ip, port, seconds) {
+	return library.logic.peers.upsert({


MaciejBaj · 2017-02-20T16:26:38Z

logic/peers.js

+	return true;
+};
+
+Peers.prototype.ban = function (ip, port, seconds) {


we are passing whole peer object / instance to every other function

Yep, logic should be changed here.

…09_rewrite-peers-module

4miners · 2017-02-24T04:00:56Z

logic/peers.js

+	};
+
+	peer = self.create(peer);
+


We should check here if peer is valid one (have string property).

4miners · 2017-02-24T04:07:25Z

modules/peers.js

+		var passed = true;
+		_.each(filter, function (value, key) {
+			// Special case for dapp peers
+			if (key === 'dappid' && (peer[key] === null || (Array.isArray(peer[key]) && !_.includes(peer[key], String(value))))) {


There is something wrong with that, need more tests.

4miners · 2017-02-24T04:08:45Z

modules/peers.js

+		{name: 'height',    def: 1},
+		{name: 'os',        def: null},
+		{name: 'version',   def: null},
+		{name: 'broadhash', def: null, init: function (col) {


Need more tests.

4miners · 2017-02-24T04:12:14Z

modules/peers.js

-	var where = [];
-	var params = {};
+__private.dbSave = function (cb) {
+	var peers = library.logic.peers.list();


We should call normalized version library.logic.peers.list(true);, so later not need to set default values for SQL query - will be more readable.

karmacoma · 2017-02-27T12:02:59Z

Closing and reopening with branch conflicts resolved against latest development.

4miners and others added 19 commits February 5, 2017 05:58

Retrieve git commit info only once on app start

901a28d

Improved documentation

b2efb03

Fix unhandled promise rejection

4c6b835

Move peers management to memory instead of database

7468622

Save peers to db on node shutdown and load them on node start

c1373db

Move peers management to memory instead of database

2f028a5

Save peers to db on node shutdown and load them on node start

46c86c9

Merge branch '409_rewrite-peers-module' of https://github.com/4miners…

dd4725b

…/lisk into 409_rewrite-peers-module

Start sync when peers ready, improve logging

d2a98e6

Move peers management to memory instead of database

41d1ca1

Save peers to db on node shutdown and load them on node start

31edbb4

Merge remote-tracking branch 'origin/409_rewrite-peers-module' into 4…

22c6baa

…09_rewrite-peers-module

unit tests of peers module

854aeca

add extra peers unit tests, resolve transaction collision tests deter…

ccd36c9

…minism

load all modules for unit tests, sync peers loader unit tests

fcf2a60

load all modules for unit tests, sync peers loader unit tests

1ec011b

Improved peers logic

277bf6e

Merge with development

f41df57

Merge branch 'development' of https://github.com/LiskHQ/lisk into 409…

ff68191

…_rewrite-peers-module

4miners commented Feb 17, 2017

View reviewed changes

Merge branch '409_rewrite-peers-module' of https://github.com/4miners…

27f79cb

…/lisk into 409_rewrite-peers-module

4miners commented Feb 17, 2017

View reviewed changes

MaciejBaj reviewed Feb 20, 2017

View reviewed changes

unit tests for logic/peers

a0def7a

MaciejBaj reviewed Feb 20, 2017

View reviewed changes

MaciejBaj added 5 commits February 20, 2017 22:15

unit tests for logic/peers

f80b540

Merge remote-tracking branch 'origin/409_rewrite-peers-module' into 4…

04eb2db

…09_rewrite-peers-module

ban unban remove tests for peers logic

0bb62c4

ban unban remove tests for peers logic

a3c6175

add extra tests for peer and peers logic

a8142ba

MaciejBaj force-pushed the 409_rewrite-peers-module branch from 0e7631a to a8142ba Compare February 23, 2017 10:16

4miners commented Feb 24, 2017

View reviewed changes

logic/peers.js

};

peer = self.create(peer);

Copy link

Contributor Author

4miners Feb 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should check here if peer is valid one (have string property).

4miners commented Feb 24, 2017

View reviewed changes

karmacoma changed the title ~~Rewrite peers module - Closes #409~~ Rewrite peers module - LiskHQ:409_rewrite-peers-module Feb 24, 2017

karmacoma changed the title ~~Rewrite peers module - LiskHQ:409_rewrite-peers-module~~ Rewrite peers module - #409 Feb 24, 2017

karmacoma closed this Feb 27, 2017

karmacoma mentioned this pull request Feb 27, 2017

Rewrite peers module - Closes #409 #452

Merged

karmacoma added status: invalid and removed type: bug chore type: docs type: improvement type: test labels Aug 15, 2017

karmacoma removed their assignment Dec 11, 2017

karmacoma assigned 4miners Apr 15, 2019

karmacoma unassigned 4miners Dec 17, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rewrite peers module - #409 #441

Rewrite peers module - #409 #441

4miners commented Feb 17, 2017

4miners Feb 17, 2017

4miners Feb 17, 2017

4miners Feb 17, 2017

4miners Feb 17, 2017

4miners Feb 17, 2017

4miners Feb 17, 2017

4miners Feb 17, 2017 •

edited

Loading

4miners Feb 17, 2017

4miners Feb 17, 2017

4miners Feb 17, 2017

MaciejBaj Feb 20, 2017

4miners Feb 24, 2017

MaciejBaj Feb 20, 2017 •

edited

Loading

MaciejBaj Feb 20, 2017 •

edited

Loading

4miners Feb 24, 2017

4miners Feb 24, 2017

4miners Feb 24, 2017

4miners Feb 24, 2017

4miners Feb 24, 2017

karmacoma commented Feb 27, 2017

		scope.bus.message('bind', scope.modules);
		scope.logic.peers.bind(scope);


		req.sanitize(headers, schema.headers, function (err, report) {
		if (err) { return next(err); }

Rewrite peers module - #409 #441

Rewrite peers module - #409 #441

Conversation

4miners commented Feb 17, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

4miners Feb 17, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MaciejBaj Feb 20, 2017 • edited Loading

Choose a reason for hiding this comment

MaciejBaj Feb 20, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

karmacoma commented Feb 27, 2017

4miners Feb 17, 2017 •

edited

Loading

MaciejBaj Feb 20, 2017 •

edited

Loading

MaciejBaj Feb 20, 2017 •

edited

Loading