diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-25 11:17:52 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:52 +0800 |
| commit | 2d1ed5288cab621aba39c3a81aae7042ead14fd5 (patch) | |
| tree | 3312352700814c6e97305b84a58672ee1f059e66 /dex/app.go | |
| parent | f5fa30b21ea123d66cf5fdaf527f546ef5a2f46b (diff) | |
| download | dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.gz dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.tar.zst dexon-2d1ed5288cab621aba39c3a81aae7042ead14fd5.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 } |