Updated version #2

bitsndbyts · 2020-02-06T14:22:40Z

No description provided.

Updating node

Removed logs

golangcibot · 2020-02-06T14:41:15Z

config/app.go

@@ -124,8 +131,11 @@ func (a *AppConfig) Validate() error {
 	if a.RPCAddress == "" {
 		return errors.Errorf("Invalid rpc_address")
 	}
-	if a.ResolverAddress == "" {
-		return errors.Errorf("Invalid resolver_address")
+	if a.Resolver.ID == "" {


if statements should only be cuddled with assignments (from wsl)

golangcibot · 2020-02-06T14:41:15Z

config/app.go

+	if a.Resolver.ID == "" {
+		return errors.Errorf("Invalid resolver_id")
+	}
+	if a.Resolver.IP == "" {


if statements should only be cuddled with assignments (from wsl)

golangcibot · 2020-02-06T14:41:16Z

tx/manager.go

 	if err != nil {
 		return nil, err
 	}

 	log.Printf("Querying the transaction with hash `%s`", hash)
-	res, err := node.Tx(_hash, !m.CLIContext.TrustNode)
+	res, err := node.Tx(_hash, !m.CLI.TrustNode)


assignments should only be cuddled with other assignments (from wsl)

golangcibot · 2020-02-06T14:41:16Z

tx/query.go

-	return common.QuerySubscription(t.Manager.CLIContext, t.Manager.CLIContext.Codec, id)
+	events := sdk.StringifyEvents(res.TxResult.Events)
+	id := events[1].Attributes[0].Value
+	return common.QuerySubscription(t.Manager.CLI.CLIContext, id)


return statements should not be cuddled if block has more than two lines (from wsl)

golangcibot · 2020-02-06T14:41:16Z

utils/node.go

-	if id == "" {
+func ProcessNode(cfg *config.AppConfig, tx *_tx.Tx, _vpn types.BaseVPN) (*config.AppConfig, *vpn.Node, error) {
+	from := tx.Manager.CLI.FromAddress
+	if cfg.Node.ID == "" {


if statements should only be cuddled with assignments used in the if statement itself (from wsl)

golangcibot · 2020-02-06T14:41:20Z

node/server.go

 	if !n.pubKey.VerifyBytes(data, msg.NodeOwnerSignature) {
-		return NewMsgError(4, "Invalid node owner signature")
+		return NewMsgError(5, "Invalid node owner signature")


mnd: Magic number: 5, in detected (from gomnd)

golangcibot · 2020-02-06T14:41:21Z

node/server.go

 	}
 	if !pubKey.VerifyBytes(data, msg.ClientSignature) {
 		return NewMsgError(5, "Invalid client signature")
 	}

+	sub, err := n.tx.QuerySubscription(msg.ID.String())
+	if err != nil {
+		return NewMsgError(5, "Invalid client signature")


mnd: Magic number: 5, in detected (from gomnd)

golangcibot · 2020-02-06T14:41:21Z

node/server.go

+
+	if !msg.Bandwidth.AllLTE(sub.RemainingBandwidth) {
+		n.clients[msg.ID.String()].conn.Close()
+		return NewMsgError(5, "Invalid bandwidth")


mnd: Magic number: 5, in detected (from gomnd)

golangcibot · 2020-02-06T14:41:21Z

node/server.go

@@ -27,12 +27,19 @@ type client struct {
 var (
 	upgrader = &websocket.Upgrader{
 		HandshakeTimeout: 45 * time.Second,
+		WriteBufferSize:  1024,


mnd: Magic number: 1024, in detected (from gomnd)

golangcibot · 2020-02-06T14:41:22Z

utils/node.go

+
+		_msg := vpn.NewMsgRegisterVPNOnResolver(from, nodeID, resolverId)
+
+		data, err := tx.CompleteAndSubscribeTx(_msg)


shadow: declaration of "err" shadows declaration at line 70 (from govet)

golangcibot · 2020-02-06T14:46:35Z

types/node.go

+	ID      string `json:"id" `
+	Address string `json:"address" `
+	Deposit Coin   `json:"deposit"`
+


File is not goimports-ed with -local github.com/sentinel-official/dvpn-node (from goimports)

Suggested change

golangcibot · 2020-02-06T14:46:35Z

config/app.go

@@ -38,24 +41,28 @@ prices_per_gb = "{{ .Node.PricesPerGB }}"
 // nolint:gochecknoinits
 func init() {
 	var err error
-
+	
 	appConfigTemplate, err = template.New("appConfig").Parse(defaultAppConfigTemplate)
 	if err != nil {
 		panic(err)
 	}


File is not goimports-ed with -local github.com/sentinel-official/dvpn-node (from goimports)

Suggested change

}

golangcibot · 2020-02-06T14:46:36Z

utils/node.go

}
-

File is not goimports-ed with -local github.com/sentinel-official/dvpn-node (from goimports)

Suggested change

golangcibot · 2020-02-06T14:46:36Z

node/server.go

@@ -556,7 +581,7 @@ func (n *Node) readMessages(id string, index uint64) {
 			continue
 		}

-		if errMsg := n.handleIncomingMessage(client.pubKey, &msg); errMsg != nil {
+		if errMsg := n.handleIncomingMessage(client.pubKey, msg); errMsg != nil {
 			client.outMessages <- errMsg


mnd: Magic number: 2, in detected (from gomnd)

golangcibot · 2020-02-06T14:46:36Z

node/server.go

 	if err := msg.Validate(); err != nil {
-		return NewMsgError(3, "Invalid message")
+		return NewMsgError(2, "Invalid message")
 	}



mnd: Magic number: 5, in detected (from gomnd)

golangcibot · 2020-02-06T14:46:37Z

node/server.go

 	if !n.pubKey.VerifyBytes(data, msg.NodeOwnerSignature) {
-		return NewMsgError(4, "Invalid node owner signature")


mnd: Magic number: 5, in detected (from gomnd)

…dating-node # Conflicts: # node/node.go # node/server.go

Updating node

golangcibot · 2020-02-17T11:27:15Z

node/server.go

 		}

-		if err := n.db.SessionFindOneAndUpdate(updates, query, args...); err != nil {
-			panic(err)
+		signature, err := n.tx.SignSessionBandwidth(s.ID, s.Index, s.Bandwidth)


ineffectual assignment to err (from ineffassign)

golangcibot · 2020-02-17T11:27:16Z

node/node.go

+
+	if client != nil {
+		if makeTx {
+			signature, err := n.tx.SignSessionBandwidth(_id, s.Index, s.Bandwidth) // nolint:govet


whyNoLint: include an explanation for nolint directive (from gocritic)

golangcibot · 2020-02-17T11:27:16Z

node/node.go

@@ -120,16 +94,29 @@ func (n *Node) updateBandwidthInfos() error {
 		}

 		var messages []sdk.Msg
+		var ids []string


declarations should never be cuddled (from wsl)

golangcibot · 2020-02-17T11:27:16Z

node/node.go

@@ -120,16 +94,29 @@ func (n *Node) updateBandwidthInfos() error {
 		}

 		var messages []sdk.Msg
+		var ids []string
+		var wg sync.WaitGroup


declarations should never be cuddled (from wsl)

golangcibot · 2020-02-17T11:27:17Z

node/node.go

 			go func(id string, bandwidth hub.Bandwidth, makeTx bool) {
 				message, err := n.requestBandwidthSign(id, bandwidth, makeTx)
 				if err != nil {
 					panic(err)
 				}
+				if message != nil {


if statements should only be cuddled with assignments (from wsl)

golangcibot · 2020-02-17T11:27:18Z

node/server.go

}
+

unnecessary trailing newline (from whitespace)

golangcibot · 2020-02-17T11:27:18Z

node/server.go

+
+			var msg types.Msg
+			if err := json.Unmarshal(p, &msg); err != nil {
+				client.outMessages <- NewMsgError(1, "Error occurred while decoding the message")


mnd: Magic number: 1, in detected (from gomnd)

golangcibot · 2020-02-17T11:27:18Z

node/server.go

+
+		_session = &types.Session{
+			ID:        sub.ID,
+			Index:     index + 1,


mnd: Magic number: 1, in detected (from gomnd)

golangcibot · 2020-02-17T11:27:19Z

node/server.go

+			"_status": types.INACTIVE,
+		}
+
+		if err := n.db.SessionFindOneAndUpdate(updates, query, args...); err != nil {


shadow: declaration of "err" shadows declaration at line 255 (from govet)

golangcibot · 2020-02-17T11:27:19Z

node/server.go

+				if err.Error() == "couldn't create db: Error initializing DB: resource temporarily unavailable" {
+					continue
+				} else {
+					err.Error()


unusedresult: result of (error).Error call not used (from govet)

bitsndbyts and others added 28 commits December 11, 2019 13:37

Updated code with resolver

d4a8b36

Updating id types

76eddfa

Updated with docker

6b69518

Fixed small issues

40ca70b

Fixed config issue

148ccb5

Updated with resolver ID type

5231b28

Printing msg

71e5d4c

modified upload speed

978b2de

Fixed resolver registration on resolver

048c1cd

printing response

bc31787

Modified structure

d2f3d9a

Added resolver id in subscription

43ac36d

logging responses

8540400

Updated method type

d696c0e

Printing

ee24269

Upgraded

fab95b5

Added websocket in header

73f39cb

print msg type

afb8698

Updated ID types

9c6d5f9

Updating msg validations

eb7b33c

Updating msg log

1705867

Removed println

4ff1926

Logging session signatures

64cf5cf

Removed saving node bandwidth

dc89c02

Removed logs

ac69646

Merge pull request #1 from bitsndbyts/updating-node

506a65e

Updating node

Removed logs

a94f3da

Merge pull request #2 from bitsndbyts/updating-node

deef7b1

Removed logs

golangcibot reviewed Feb 6, 2020

View reviewed changes

bitsndbyts added 15 commits February 8, 2020 12:12

Removed saving node bandwidth

31e89b9

Added msg validations

6f33d8a

Adding close connection

5bc2de6

logging websocket ids

3af8616

Updating websocket connection

a93d1fe

Updating query session from chain

f3a6a08

Updated socket init issue

c8088a9

Added delete client

5c995a2

Updated session status

d84764a

Updated disconnect websocket

0e4313f

Fixing bandwidth of disconnect websocket

93047f6

Added delete session transaction

085c147

Fixed RPC error

2795f30

Merge branch 'development' of github.com:bitsndbyts/dvpn-node into up…

d9519b2

…dating-node # Conflicts: # node/node.go # node/server.go

Merge pull request #3 from bitsndbyts/updating-node

4e0d9c8

Updating node

golangcibot reviewed Feb 17, 2020

View reviewed changes

Updated docker file

2f0563c

ironman0x7b2 closed this Jun 13, 2020

bsrinivas8687 pushed a commit that referenced this pull request May 19, 2021

Refactored code #2

b9016b0

bsrinivas8687 pushed a commit that referenced this pull request May 19, 2021

Merge pull request #2 from ironman0x7b2/updates

f54a337

This was referenced Nov 23, 2021

Docker LOG shows PEERs connected after disconnecting #82

Closed

Block Chain shows Greater Bandwidth than the CLI Query #83

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated version #2

Updated version #2

bitsndbyts commented Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 6, 2020

golangcibot Feb 17, 2020

golangcibot Feb 17, 2020

golangcibot Feb 17, 2020

golangcibot Feb 17, 2020

golangcibot Feb 17, 2020

golangcibot Feb 17, 2020

golangcibot Feb 17, 2020

golangcibot Feb 17, 2020

golangcibot Feb 17, 2020

golangcibot Feb 17, 2020


		_msg := vpn.NewMsgRegisterVPNOnResolver(from, nodeID, resolverId)

		data, err := tx.CompleteAndSubscribeTx(_msg)

		if !n.pubKey.VerifyBytes(data, msg.NodeOwnerSignature) {
		return NewMsgError(4, "Invalid node owner signature")

Updated version #2

Updated version #2

Conversation

bitsndbyts commented Feb 6, 2020

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

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

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