diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-25 11:17:52 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@byzantine-lab.io> | 2019-06-12 17:27:17 +0800 |
| commit | dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d (patch) | |
| tree | 2f186f3a17f5c0241b3e21a07101f18f76ca70f8 /dex/app.go | |
| parent | f80216879307f6fa21b5937e3644e417226d9467 (diff) | |
| download | go-tangerine-dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d.tar go-tangerine-dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d.tar.gz go-tangerine-dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d.tar.bz2 go-tangerine-dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d.tar.lz go-tangerine-dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d.tar.xz go-tangerine-dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d.tar.zst go-tangerine-dcb706ee7a9a497527dff649d8cf7d37a1d8fb2d.zip | |
vendor: sync consensus core and fix conflict
Diffstat (limited to 'dex/app.go')
| -rw-r--r-- | dex/app.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dex/app.go b/dex/app.go index d5b7d3556..b1558b46f 100644 --- a/dex/app.go +++ b/dex/app.go @@ -261,9 +261,8 @@ func (d *DexconApp) PrepareWitness(consensusHeight uint64) (witness coreTypes.Wi } return coreTypes.Witness{ - Timestamp: time.Unix(witnessBlock.Time().Int64(), 0), - Height: witnessBlock.NumberU64(), - Data: witnessData, + Height: witnessBlock.NumberU64(), + Data: witnessData, }, nil } |