heartbeat + enhanced tests + refactor #57

samparsky · 2019-02-04T05:56:17Z

Fixes #17

services/validatorWorker/heartbeat.js

test/integration.js

services/validatorWorker/heartbeat.js

test/integration.js

Ivshti · 2019-02-09T20:54:17Z

test/integration.js

+		const { balances } = res.validatorMessages[0].msg
+		const fakeBalances = { "publisher": "3" }
+		// increase the state tree balance by 1
+		let incBalances = {}


you don't need to increment; the same balances is also a valid state transition, cause it does not violate the OUTPACE rules

Ivshti

check out the comments for the tests: neither of the tests you've changed need to increment the balance tree; transitioning from a balance tree to the same tree is valid in OUTPACE

also heartbeat doesn't seem to be:

sent from the leader
checked in the test/integration

Ivshti · 2019-02-11T19:55:54Z

routes/channel.js

@@ -156,11 +156,14 @@ function isValidatorMsgValid(msg) {
 	// @TODO either make this more sophisticated, or rewrite this in a type-safe lang
 	// for example, we should validate if every value in balances is a positive integer
 	return msg
-		&& typeof(msg.stateRoot) === 'string' && msg.stateRoot.length == 64
+		&& (
+			(msg.stateRoot && typeof(msg.stateRoot) === 'string' && msg.stateRoot.length == 64)


msg.stateRoot check here is redudant - if it's a string and the length is 64, it's certainly truthy

Ivshti · 2019-02-11T19:56:49Z

services/validatorWorker/follower.js

 const producer = require('./producer')
+const { heartbeat } = require('./heartbeat')


should be const heartbeat = require('./heartbeat') and heartbeat should directly expose heartbeat, to follow the convention set by producer, leader, follower

Ivshti · 2019-02-11T19:57:15Z

services/validatorWorker/follower.js

+	.then(function(res){
+		// send heartbeat
+		if(res && res.nothingNew){
+			Promise.resolve(


the new lines here are redundant IMO,

but most importantly, why is heartbeat not returning a promise?

Ivshti · 2019-02-11T20:00:34Z

services/validatorWorker/follower.js

@@ -58,7 +68,9 @@ function onNewState(adapter, {channel, balances, newMsg, approveMsg}) {
 			return { nothingNew: true }
 		}
 	})
-	.then(function(){
+	.then(function(res){
+		if(res && res.nothingNew) return res


this seems bad, but it can be mitigated by just deleting the second .then

just remove lines 70, 71

Ivshti · 2019-02-11T20:04:49Z

services/validatorWorker/follower.js

@@ -58,7 +68,9 @@ function onNewState(adapter, {channel, balances, newMsg, approveMsg}) {
 			return { nothingNew: true }


also the res here from verify() should be renamed to isValid

Ivshti · 2019-02-11T20:05:46Z

services/validatorWorker/heartbeat.js

+	})
+}
+
+module.exports = { heartbeat }


just module.exports = heartbeat as the convention from follower/leader/etc.

services/validatorWorker/leader.js

test/integration.js

Ivshti · 2019-02-12T12:42:57Z

services/validatorWorker/follower.js

+	.then(function(res){
+		// send heartbeat
+		if(res && res.nothingNew){
+			heartbeat(adapter, channel)


should be return heartbeat, right?

…-validator-stack-js into heartbeat-message

samparsky force-pushed the heartbeat-message branch from 0a35a6f to 6cad255 Compare February 4, 2019 06:20

samparsky changed the title ~~[WIP] added post heartbeat message route~~ [WIP] heartbeat Feb 4, 2019

samparsky force-pushed the heartbeat-message branch from 374487c to d8bd899 Compare February 4, 2019 16:21

samparsky changed the title ~~[WIP] heartbeat~~ heartbeat Feb 4, 2019

samparsky force-pushed the heartbeat-message branch 4 times, most recently from 47b1558 to e913097 Compare February 5, 2019 11:13

Ivshti requested changes Feb 5, 2019

View reviewed changes

services/validatorWorker/heartbeat.js Outdated Show resolved Hide resolved

test/integration.js Outdated Show resolved Hide resolved

Ivshti reviewed Feb 5, 2019

View reviewed changes

services/validatorWorker/heartbeat.js Outdated Show resolved Hide resolved

samparsky force-pushed the heartbeat-message branch 2 times, most recently from c10b0c0 to d9c944f Compare February 5, 2019 14:29

samparsky added 11 commits February 6, 2019 19:56

added post heartbeat message route

d449518

fix: rename vars

8f6a94d

added: heartbeat

71bc28b

added: validator worker heartbeat

25e5906

format code

44b6ec8

fix: heartbeat implementation

c28db9c

test: heartbeat notification

ed7bef5

modify: timestamp

470367a

fix: timestamp

d2fcb79

fix: signature test case

083e03f

fix: timestmap

f1bdb74

samparsky force-pushed the heartbeat-message branch from d9c944f to f1bdb74 Compare February 6, 2019 18:56

samparsky added 2 commits February 6, 2019 20:59

fix: remove hardcoded vals

e980a2d

fix: tests, added index.js

1a50e41

Ivshti changed the title ~~heartbeat~~ heartbeat + enhanced tests Feb 9, 2019

Ivshti reviewed Feb 9, 2019

View reviewed changes

test/integration.js Show resolved Hide resolved

Ivshti reviewed Feb 9, 2019

View reviewed changes

Ivshti requested changes Feb 9, 2019

View reviewed changes

Ivshti changed the title ~~heartbeat + enhanced tests~~ heartbeat + enhanced tests + refactor Feb 9, 2019

fix: heartbeat test case, timestamp

3e834cf

samparsky force-pushed the heartbeat-message branch 3 times, most recently from 06fba82 to a679855 Compare February 11, 2019 17:57

Ivshti requested changes Feb 11, 2019

View reviewed changes

Ivshti approved these changes Feb 12, 2019

View reviewed changes

samparsky and others added 8 commits February 12, 2019 14:15

fix: test case

a64406b

test/integration updated

51db940

services/validatorWorker/follower: fix invalid sig check

ca057b8

Added a short doc page for validator message types

5d24220

Fixed formatting

2871ba4

Added timestamp property

adb3835

services/validatorWorker/follower: rename result of verify

2ddc59c

fix: test case

1ec4b60

samparsky force-pushed the heartbeat-message branch from 254acb5 to 1ec4b60 Compare February 12, 2019 13:16

samparsky added 3 commits February 12, 2019 14:18

Merge branch 'master' into heartbeat-message

e433260

fix: return heartbeat

b800fe1

Merge branch 'heartbeat-message' of https://github.com/samparsky/adex…

9eeb934

…-validator-stack-js into heartbeat-message

Ivshti merged commit a0c557b into AmbireTech:master Feb 13, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

heartbeat + enhanced tests + refactor #57

heartbeat + enhanced tests + refactor #57

samparsky commented Feb 4, 2019

Ivshti Feb 9, 2019

Ivshti left a comment

Ivshti Feb 11, 2019

Ivshti Feb 11, 2019

Ivshti Feb 11, 2019

Ivshti Feb 11, 2019

Ivshti Feb 11, 2019

Ivshti Feb 11, 2019

Ivshti Feb 11, 2019

Ivshti Feb 12, 2019

		const producer = require('./producer')
		const { heartbeat } = require('./heartbeat')

		@@ -58,7 +68,9 @@ function onNewState(adapter, {channel, balances, newMsg, approveMsg}) {
		return { nothingNew: true }

heartbeat + enhanced tests + refactor #57

heartbeat + enhanced tests + refactor #57

Conversation

samparsky commented Feb 4, 2019

Choose a reason for hiding this comment

Ivshti left a 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

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