fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-25 02:31:46 +00:00
Code Issues Projects Releases Wiki Activity

types.SignBytes -> o.SignBytes

Browse Source
This commit is contained in:
Ethan Buchman
2018-03-02 01:50:17 -05:00
parent abeeeeb611
commit 5378bfc5c7
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
consensus/byzantine_test.go
View File

@ -289,17 +289,17 @@ func (privVal *ByzantinePrivValidator) GetPubKey() crypto.PubKey {
} }
func (privVal *ByzantinePrivValidator) SignVote(chainID string, vote *types.Vote) (err error) { func (privVal *ByzantinePrivValidator) SignVote(chainID string, vote *types.Vote) (err error) {
vote.Signature, err = privVal.Sign(types.SignBytes(chainID, vote)) vote.Signature, err = privVal.Sign(vote.SignBytes(chainID))
return err return err
} }
func (privVal *ByzantinePrivValidator) SignProposal(chainID string, proposal *types.Proposal) (err error) { func (privVal *ByzantinePrivValidator) SignProposal(chainID string, proposal *types.Proposal) (err error) {
proposal.Signature, _ = privVal.Sign(types.SignBytes(chainID, proposal)) proposal.Signature, _ = privVal.Sign(proposal.SignBytes(chainID))
return nil return nil
} }
func (privVal *ByzantinePrivValidator) SignHeartbeat(chainID string, heartbeat *types.Heartbeat) (err error) { func (privVal *ByzantinePrivValidator) SignHeartbeat(chainID string, heartbeat *types.Heartbeat) (err error) {
heartbeat.Signature, _ = privVal.Sign(types.SignBytes(chainID, heartbeat)) heartbeat.Signature, _ = privVal.Sign(heartbeat.SignBytes(chainID))
return nil return nil
} }

2
consensus/state.go
View File

@ -1269,7 +1269,7 @@ func (cs *ConsensusState) defaultSetProposal(proposal *types.Proposal) error {
} }
// Verify signature // Verify signature
if !cs.Validators.GetProposer().PubKey.VerifyBytes(types.SignBytes(cs.state.ChainID, proposal), proposal.Signature) { if !cs.Validators.GetProposer().PubKey.VerifyBytes(proposal.SignBytes(cs.state.ChainID), proposal.Signature) {
return ErrInvalidProposalSignature return ErrInvalidProposalSignature
} }

2
lite/helpers.go
View File

@ -102,7 +102,7 @@ func makeVote(header *types.Header, vals *types.ValidatorSet, key crypto.PrivKey
BlockID: types.BlockID{Hash: header.Hash()}, BlockID: types.BlockID{Hash: header.Hash()},
} }
// Sign it // Sign it
signBytes := types.SignBytes(header.ChainID, vote) signBytes := vote.SignBytes(header.ChainID)
vote.Signature = key.Sign(signBytes) vote.Signature = key.Sign(signBytes)
return vote return vote
} }

4
types/heartbeat_test.go
View File

@ -25,11 +25,11 @@ func TestHeartbeatString(t *testing.T) {
require.Contains(t, nilHb.String(), "nil", "expecting a string and no panic") require.Contains(t, nilHb.String(), "nil", "expecting a string and no panic")
hb := &Heartbeat{ValidatorIndex: 1, Height: 11, Round: 2} hb := &Heartbeat{ValidatorIndex: 1, Height: 11, Round: 2}
require.Equal(t, hb.String(), "Heartbeat{1:000000000000 11/02 (0) <nil>}") require.Equal(t, hb.String(), "Heartbeat{1:000000000000 11/02 (0) {<nil>}}")
var key crypto.PrivKeyEd25519 var key crypto.PrivKeyEd25519
hb.Signature = key.Sign([]byte("Tendermint")) hb.Signature = key.Sign([]byte("Tendermint"))
require.Equal(t, hb.String(), "Heartbeat{1:000000000000 11/02 (0) /FF41E371B9BF.../}") require.Equal(t, hb.String(), "Heartbeat{1:000000000000 11/02 (0) {/FF41E371B9BF.../}}")
} }
/* TODO WIRE make json work /* TODO WIRE make json work

8
types/priv_validator/priv_validator_test.go
View File

@ -211,7 +211,7 @@ func TestDifferByTimestamp(t *testing.T) {
proposal := newProposal(height, round, block1) proposal := newProposal(height, round, block1)
err := privVal.SignProposal(chainID, proposal) err := privVal.SignProposal(chainID, proposal)
assert.NoError(t, err, "expected no error signing proposal") assert.NoError(t, err, "expected no error signing proposal")
signBytes := types.SignBytes(chainID, proposal) signBytes := proposal.SignBytes(chainID)
sig := proposal.Signature sig := proposal.Signature
timeStamp := clipToMS(proposal.Timestamp) timeStamp := clipToMS(proposal.Timestamp)
@ -222,7 +222,7 @@ func TestDifferByTimestamp(t *testing.T) {
assert.NoError(t, err, "expected no error on signing same proposal") assert.NoError(t, err, "expected no error on signing same proposal")
assert.Equal(t, timeStamp, proposal.Timestamp) assert.Equal(t, timeStamp, proposal.Timestamp)
assert.Equal(t, signBytes, types.SignBytes(chainID, proposal)) assert.Equal(t, signBytes, proposal.SignBytes(chainID))
assert.Equal(t, sig, proposal.Signature) assert.Equal(t, sig, proposal.Signature)
} }
@ -237,7 +237,7 @@ func TestDifferByTimestamp(t *testing.T) {
err = privVal.SignVote("mychainid", vote) err = privVal.SignVote("mychainid", vote)
assert.NoError(t, err, "expected no error signing vote") assert.NoError(t, err, "expected no error signing vote")
signBytes := types.SignBytes(chainID, vote) signBytes := vote.SignBytes(chainID)
sig := vote.Signature sig := vote.Signature
timeStamp := clipToMS(vote.Timestamp) timeStamp := clipToMS(vote.Timestamp)
@ -248,7 +248,7 @@ func TestDifferByTimestamp(t *testing.T) {
assert.NoError(t, err, "expected no error on signing same vote") assert.NoError(t, err, "expected no error on signing same vote")
assert.Equal(t, timeStamp, vote.Timestamp) assert.Equal(t, timeStamp, vote.Timestamp)
assert.Equal(t, signBytes, types.SignBytes(chainID, vote)) assert.Equal(t, signBytes, vote.SignBytes(chainID))
assert.Equal(t, sig, vote.Signature) assert.Equal(t, sig, vote.Signature)
} }
} }

4
types/priv_validator/sign_info.go
View File

@ -112,7 +112,7 @@ func (info *LastSignedInfo) Reset() {
// Else it returns an error. // Else it returns an error.
func (lsi *LastSignedInfo) SignVote(signer types.Signer, chainID string, vote *types.Vote) error { func (lsi *LastSignedInfo) SignVote(signer types.Signer, chainID string, vote *types.Vote) error {
height, round, step := vote.Height, vote.Round, voteToStep(vote) height, round, step := vote.Height, vote.Round, voteToStep(vote)
signBytes := types.SignBytes(chainID, vote) signBytes := vote.SignBytes(chainID)
sameHRS, err := lsi.Verify(height, round, step) sameHRS, err := lsi.Verify(height, round, step)
if err != nil { if err != nil {
@ -151,7 +151,7 @@ func (lsi *LastSignedInfo) SignVote(signer types.Signer, chainID string, vote *t
// Else it returns an error. // Else it returns an error.
func (lsi *LastSignedInfo) SignProposal(signer types.Signer, chainID string, proposal *types.Proposal) error { func (lsi *LastSignedInfo) SignProposal(signer types.Signer, chainID string, proposal *types.Proposal) error {
height, round, step := proposal.Height, proposal.Round, stepPropose height, round, step := proposal.Height, proposal.Round, stepPropose
signBytes := types.SignBytes(chainID, proposal) signBytes := proposal.SignBytes(chainID)
sameHRS, err := lsi.Verify(height, round, step) sameHRS, err := lsi.Verify(height, round, step)
if err != nil { if err != nil {

2
types/priv_validator/unencrypted.go
View File

@ -61,6 +61,6 @@ func (upv *PrivValidatorUnencrypted) SignProposal(chainID string, proposal *type
func (upv *PrivValidatorUnencrypted) SignHeartbeat(chainID string, heartbeat *types.Heartbeat) error { func (upv *PrivValidatorUnencrypted) SignHeartbeat(chainID string, heartbeat *types.Heartbeat) error {
var err error var err error
heartbeat.Signature, err = upv.PrivKey.Sign(types.SignBytes(chainID, heartbeat)) heartbeat.Signature, err = upv.PrivKey.Sign(heartbeat.SignBytes(chainID))
return err return err
} }