diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-10-25 11:17:52 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2018-12-19 20:54:27 +0800 |
| commit | 778bf57b359326317b0e850a9a1f262a23f7f286 (patch) | |
| tree | 9ab5209408453b0db129a6b73ab4d5df28a02859 /dex/app.go | |
| parent | dbeb7df0740ea046d63890e82dc0b88a34385478 (diff) | |
| download | dexon-778bf57b359326317b0e850a9a1f262a23f7f286.tar dexon-778bf57b359326317b0e850a9a1f262a23f7f286.tar.gz dexon-778bf57b359326317b0e850a9a1f262a23f7f286.tar.bz2 dexon-778bf57b359326317b0e850a9a1f262a23f7f286.tar.lz dexon-778bf57b359326317b0e850a9a1f262a23f7f286.tar.xz dexon-778bf57b359326317b0e850a9a1f262a23f7f286.tar.zst dexon-778bf57b359326317b0e850a9a1f262a23f7f286.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 } |