switch Reply type in socket for other messages

- add error description on error
tendermint · Sep 21, 2018 · 7c8375c · 7c8375c
1 parent ceb860c
commit 7c8375c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/cmd/tendermint/commands/init.go b/cmd/tendermint/commands/init.go
@@ -59,8 +59,8 @@ func initFilesWithConfig(config *cfg.Config) error {
 		}
 		genDoc.Validators = []types.GenesisValidator{{
 			Address: pv.GetPubKey().Address(),
-			PubKey: pv.GetPubKey(),
-			Power:  10,
+			PubKey:  pv.GetPubKey(),
+			Power:   10,
 		}}
 
 		if err := genDoc.SaveAs(genFile); err != nil {

diff --git a/cmd/tendermint/commands/testnet.go b/cmd/tendermint/commands/testnet.go
@@ -92,9 +92,9 @@ func testnetFiles(cmd *cobra.Command, args []string) error {
 		pv := privval.LoadFilePV(pvFile)
 		genVals[i] = types.GenesisValidator{
 			Address: pv.GetPubKey().Address(),
-			PubKey: pv.GetPubKey(),
-			Power:  1,
-			Name:   nodeDirName,
+			PubKey:  pv.GetPubKey(),
+			Power:   1,
+			Name:    nodeDirName,
 		}
 	}
 

diff --git a/consensus/metrics.go b/consensus/metrics.go
@@ -85,7 +85,6 @@ func PrometheusMetrics() *Metrics {
 			Help:      "Total power of the byzantine validators.",
 		}, []string{}),
 
-
 		BlockIntervalSeconds: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
 			Subsystem: "consensus",
 			Name:      "block_interval_seconds",

diff --git a/consensus/state.go b/consensus/state.go
@@ -961,7 +961,6 @@ func (cs *ConsensusState) createProposalBlock() (block *types.Block, blockParts
 	return block, parts
 }
 
-
 // Enter: `timeoutPropose` after entering Propose.
 // Enter: proposal block and POL is ready.
 // Enter: any +2/3 prevotes for future round.

diff --git a/privval/socket.go b/privval/socket.go
@@ -180,7 +180,7 @@ func (sc *SocketPV) SignProposal(
 		return err
 	}
 
-	*proposal = *res.(*SignProposalRequest).Proposal
+	*proposal = *res.(*SignedProposalReply).Proposal
 
 	return nil
 }
@@ -200,7 +200,7 @@ func (sc *SocketPV) SignHeartbeat(
 		return err
 	}
 
-	*heartbeat = *res.(*SignHeartbeatRequest).Heartbeat
+	*heartbeat = *res.(*SignedHeartbeatReply).Heartbeat
 
 	return nil
 }
@@ -472,10 +472,18 @@ func (rs *RemoteSigner) handleConnection(conn net.Conn) {
 
 		case *SignProposalRequest:
 			err = rs.privVal.SignProposal(rs.chainID, r.Proposal)
-			res = &SignProposalRequest{r.Proposal}
+			if err != nil {
+				res = &SignedProposalReply{r.Proposal, &Error{0, err.Error()}}
+			} else {
+				res = &SignedProposalReply{r.Proposal, nil}
+			}
 		case *SignHeartbeatRequest:
 			err = rs.privVal.SignHeartbeat(rs.chainID, r.Heartbeat)
-			res = &SignHeartbeatRequest{r.Heartbeat}
+			if err != nil {
+				res = &SignedHeartbeatReply{r.Heartbeat, &Error{0, err.Error()}}
+			} else {
+				res = &SignedHeartbeatReply{r.Heartbeat, nil}
+			}
 		default:
 			err = fmt.Errorf("unknown msg: %v", r)
 		}
@@ -547,6 +555,7 @@ type SignedHeartbeatReply struct {
 
 // Error allows (remote) validators to include meaningful error descriptions in their reply.
 type Error struct {
+	// TODO(ismail): create an enum of known errors
 	Code        int
 	Description string
 }