TrueCloudLab/neo-go
6
0
Fork 0
mirror of https://github.com/nspcc-dev/neo-go.git synced 2024-10-16 05:43:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #866 from nspcc-dev/drop-consensus-timestamp

Browse source 
consensus: drop timestamp from outer payload
This commit is contained in:
Roman Khimov 2020-04-17 10:01:02 +03:00 committed by GitHub
commit 266138c00c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkg/consensus/payload.go
View file

@ -34,7 +34,6 @@ type (
validatorIndex uint16 validatorIndex uint16
prevHash util.Uint256 prevHash util.Uint256
height uint32 height uint32
timestamp uint32
Witness transaction.Witness Witness transaction.Witness
} }
@ -167,7 +166,6 @@ func (p *Payload) EncodeBinaryUnsigned(w *io.BinWriter) {
w.WriteBytes(p.prevHash[:]) w.WriteBytes(p.prevHash[:])
w.WriteU32LE(p.height) w.WriteU32LE(p.height)
w.WriteU16LE(p.validatorIndex) w.WriteU16LE(p.validatorIndex)
w.WriteU32LE(p.timestamp)
if p.message != nil { if p.message != nil {
ww := io.NewBufBinWriter() ww := io.NewBufBinWriter()
@ -229,7 +227,6 @@ func (p *Payload) DecodeBinaryUnsigned(r *io.BinReader) {
r.ReadBytes(p.prevHash[:]) r.ReadBytes(p.prevHash[:])
p.height = r.ReadU32LE() p.height = r.ReadU32LE()
p.validatorIndex = r.ReadU16LE() p.validatorIndex = r.ReadU16LE()
p.timestamp = r.ReadU32LE()
p.data = r.ReadVarBytes() p.data = r.ReadVarBytes()
if r.Err != nil { if r.Err != nil {

11
pkg/consensus/payload_test.go
View file

@ -110,7 +110,7 @@ func TestConsensusPayload_Serializable(t *testing.T) {
func TestConsensusPayload_DecodeBinaryInvalid(t *testing.T) { func TestConsensusPayload_DecodeBinaryInvalid(t *testing.T) {
// PrepareResponse ConsensusPayload consists of: // PrepareResponse ConsensusPayload consists of:
// 46-byte common prefix // 42-byte common prefix
// 1-byte varint length of the payload (34), // 1-byte varint length of the payload (34),
// - 1-byte view number // - 1-byte view number
// - 1-byte message type (PrepareResponse) // - 1-byte message type (PrepareResponse)
@ -118,12 +118,12 @@ func TestConsensusPayload_DecodeBinaryInvalid(t *testing.T) {
// 1-byte delimiter (1) // 1-byte delimiter (1)
// 2-byte for empty invocation and verification scripts // 2-byte for empty invocation and verification scripts
const ( const (
lenIndex = 46 lenIndex = 42
typeIndex = 47 typeIndex = lenIndex + 1
delimeterIndex = 81 delimeterIndex = typeIndex + 34
) )
buf := make([]byte, 46+1+34+1+2) buf := make([]byte, delimeterIndex+1+2)
expected := &Payload{ expected := &Payload{
message: &message{ message: &message{
@ -202,7 +202,6 @@ func randomPayload(t *testing.T, mt messageType) *Payload {
validatorIndex: 13, validatorIndex: 13,
height: rand.Uint32(), height: rand.Uint32(),
prevHash: random.Uint256(), prevHash: random.Uint256(),
timestamp: rand.Uint32(),
Witness: transaction.Witness{ Witness: transaction.Witness{
InvocationScript: random.Bytes(3), InvocationScript: random.Bytes(3),
VerificationScript: []byte{byte(opcode.PUSH0)}, VerificationScript: []byte{byte(opcode.PUSH0)},