mirror of
https://github.com/fluencelabs/tendermint
synced 2025-06-06 01:51:20 +00:00
address review comments
- remove lock from remote signer - remove some require.NoError's
This commit is contained in:
parent
f9a564cfc3
commit
138a57258f
@ -4,7 +4,6 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
"sync"
|
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
|
|
||||||
@ -19,7 +18,6 @@ import (
|
|||||||
type RemoteSignerClient struct {
|
type RemoteSignerClient struct {
|
||||||
conn net.Conn
|
conn net.Conn
|
||||||
consensusPubKey crypto.PubKey
|
consensusPubKey crypto.PubKey
|
||||||
lock sync.Mutex
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check that RemoteSignerClient implements PrivValidator.
|
// Check that RemoteSignerClient implements PrivValidator.
|
||||||
@ -47,9 +45,6 @@ func (sc *RemoteSignerClient) GetPubKey() crypto.PubKey {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (sc *RemoteSignerClient) getPubKey() (crypto.PubKey, error) {
|
func (sc *RemoteSignerClient) getPubKey() (crypto.PubKey, error) {
|
||||||
sc.lock.Lock()
|
|
||||||
defer sc.lock.Unlock()
|
|
||||||
|
|
||||||
err := writeMsg(sc.conn, &PubKeyRequest{})
|
err := writeMsg(sc.conn, &PubKeyRequest{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -73,9 +68,6 @@ func (sc *RemoteSignerClient) getPubKey() (crypto.PubKey, error) {
|
|||||||
|
|
||||||
// SignVote implements PrivValidator.
|
// SignVote implements PrivValidator.
|
||||||
func (sc *RemoteSignerClient) SignVote(chainID string, vote *types.Vote) error {
|
func (sc *RemoteSignerClient) SignVote(chainID string, vote *types.Vote) error {
|
||||||
sc.lock.Lock()
|
|
||||||
defer sc.lock.Unlock()
|
|
||||||
|
|
||||||
err := writeMsg(sc.conn, &SignVoteRequest{Vote: vote})
|
err := writeMsg(sc.conn, &SignVoteRequest{Vote: vote})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -103,9 +95,6 @@ func (sc *RemoteSignerClient) SignProposal(
|
|||||||
chainID string,
|
chainID string,
|
||||||
proposal *types.Proposal,
|
proposal *types.Proposal,
|
||||||
) error {
|
) error {
|
||||||
sc.lock.Lock()
|
|
||||||
defer sc.lock.Unlock()
|
|
||||||
|
|
||||||
err := writeMsg(sc.conn, &SignProposalRequest{Proposal: proposal})
|
err := writeMsg(sc.conn, &SignProposalRequest{Proposal: proposal})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
@ -129,9 +118,6 @@ func (sc *RemoteSignerClient) SignProposal(
|
|||||||
|
|
||||||
// Ping is used to check connection health.
|
// Ping is used to check connection health.
|
||||||
func (sc *RemoteSignerClient) Ping() error {
|
func (sc *RemoteSignerClient) Ping() error {
|
||||||
sc.lock.Lock()
|
|
||||||
defer sc.lock.Unlock()
|
|
||||||
|
|
||||||
err := writeMsg(sc.conn, &PingRequest{})
|
err := writeMsg(sc.conn, &PingRequest{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -43,7 +43,6 @@ func TestSocketPVPubKey(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
privvalPubKey := rs.privVal.GetPubKey()
|
privvalPubKey := rs.privVal.GetPubKey()
|
||||||
require.NoError(t, err)
|
|
||||||
|
|
||||||
assert.Equal(t, privvalPubKey, clientKey)
|
assert.Equal(t, privvalPubKey, clientKey)
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user