From 688f2f832e7513cedbd7f51bced6ed76348e2b2f Mon Sep 17 00:00:00 2001 From: Wei-Ning Huang Date: Wed, 19 Dec 2018 10:22:38 +0800 Subject: 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. --- dex/app.go | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'dex/app.go') 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) -- cgit