diff options
| author | Wei-Ning Huang <w@dexon.org> | 2018-12-19 10:22:38 +0800 |
|---|---|---|
| committer | Wei-Ning Huang <w@dexon.org> | 2019-04-09 21:32:55 +0800 |
| commit | 38c9e34a926f9dc924bfe54cf25c15139acf725b (patch) | |
| tree | c242d3d0aca20eb224dcd7484c305cce7c06507a /dex/app.go | |
| parent | bc4641dacfa16b319e687fd4e376ed7ba20e61ae (diff) | |
| download | dexon-38c9e34a926f9dc924bfe54cf25c15139acf725b.tar.gz dexon-38c9e34a926f9dc924bfe54cf25c15139acf725b.tar.zst dexon-38c9e34a926f9dc924bfe54cf25c15139acf725b.zip | |
dex: remove duplicate declaration of WitnessData (#92)
Remove duplicate declaration of WitnessData and remove the TxHash field
in witness data since it does not need to be witnessed.
Diffstat (limited to 'dex/app.go')
| -rw-r--r-- | dex/app.go | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/dex/app.go b/dex/app.go index 8da00d07b..9dcfd87e9 100644 --- a/dex/app.go +++ b/dex/app.go @@ -50,12 +50,6 @@ type DexconApp struct { chainLocks sync.Map } -type witnessData struct { - Root common.Hash - TxHash common.Hash - ReceiptHash common.Hash -} - func NewDexconApp(txPool *core.TxPool, blockchain *core.BlockChain, gov *DexconGovernance, chainDB ethdb.Database, config *Config) *DexconApp { return &DexconApp{ @@ -283,9 +277,8 @@ func (d *DexconApp) PrepareWitness(consensusHeight uint64) (witness coreTypes.Wi return witness, fmt.Errorf("last pending height < consensus height") } - witnessData, err := rlp.EncodeToBytes(&witnessData{ + witnessData, err := rlp.EncodeToBytes(&types.WitnessData{ Root: witnessBlock.Root(), - TxHash: witnessBlock.TxHash(), ReceiptHash: witnessBlock.ReceiptHash(), }) if err != nil { @@ -300,7 +293,7 @@ func (d *DexconApp) PrepareWitness(consensusHeight uint64) (witness coreTypes.Wi // VerifyBlock verifies if the payloads are valid. func (d *DexconApp) VerifyBlock(block *coreTypes.Block) coreTypes.BlockVerifyStatus { - var witnessData witnessData + var witnessData types.WitnessData err := rlp.DecodeBytes(block.Witness.Data, &witnessData) if err != nil { log.Error("failed to RLP decode witness data", "error", err) |