diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-15 18:10:07 +0800 |
|---|---|---|
| committer | Jimmy Hu <jimmy.hu@dexon.org> | 2018-10-15 18:10:07 +0800 |
| commit | ea3ccc7e8699194bfe45ad7a2dc07242bb1a1038 (patch) | |
| tree | 3c02ba10d3c5d8f44c470eb92d1d85af2773ad91 /core | |
| parent | 39cf951c427179e432861473fa4e2f67810dff22 (diff) | |
| download | dexon-consensus-ea3ccc7e8699194bfe45ad7a2dc07242bb1a1038.tar dexon-consensus-ea3ccc7e8699194bfe45ad7a2dc07242bb1a1038.tar.gz dexon-consensus-ea3ccc7e8699194bfe45ad7a2dc07242bb1a1038.tar.bz2 dexon-consensus-ea3ccc7e8699194bfe45ad7a2dc07242bb1a1038.tar.lz dexon-consensus-ea3ccc7e8699194bfe45ad7a2dc07242bb1a1038.tar.xz dexon-consensus-ea3ccc7e8699194bfe45ad7a2dc07242bb1a1038.tar.zst dexon-consensus-ea3ccc7e8699194bfe45ad7a2dc07242bb1a1038.zip | |
core: fix timestamp marshaling (#207)
Diffstat (limited to 'core')
| -rw-r--r-- | core/crypto.go | 4 | ||||
| -rw-r--r-- | core/types/block.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/crypto.go b/core/crypto.go index 62c095d..f3870a5 100644 --- a/core/crypto.go +++ b/core/crypto.go @@ -26,7 +26,7 @@ import ( ) func hashWitness(witness *types.Witness) (common.Hash, error) { - binaryTimestamp, err := witness.Timestamp.MarshalBinary() + binaryTimestamp, err := witness.Timestamp.UTC().MarshalBinary() if err != nil { return common.Hash{}, err } @@ -46,7 +46,7 @@ func hashBlock(block *types.Block) (common.Hash, error) { binaryAcks[idx] = ack[:] } hashAcks := crypto.Keccak256Hash(binaryAcks...) - binaryTimestamp, err := block.Timestamp.MarshalBinary() + binaryTimestamp, err := block.Timestamp.UTC().MarshalBinary() if err != nil { return common.Hash{}, err } diff --git a/core/types/block.go b/core/types/block.go index 5996acf..710da9b 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -72,7 +72,7 @@ type Block struct { ParentHash common.Hash `json:"parent_hash"` Hash common.Hash `json:"hash"` Position Position `json:"position"` - Timestamp time.Time `json:"timestamps"` + Timestamp time.Time `json:"timestamp"` Acks common.SortedHashes `json:"acks"` Payload []byte `json:"payload"` Witness Witness `json:"witness"` |