more cleanup

Author: philipsu522

internal/consensus/state.go

@@ -2421,7 +2421,7 @@ func (cs *State) buildProposalBlock(height int64, header types.Header, lastCommi
 	txs := cs.blockExec.GetTxsForKeys(txKeys)
 	block.Version = header.Version
 	block.Data.Txs = txs
-	block.DataHash = block.Data.Hash()
+	block.DataHash = block.Data.Hash(true)
 	block.Header.Time = header.Time
 	block.Header.ProposerAddress = header.ProposerAddress
 	return block

internal/mempool/reactor.go

@@ -120,7 +120,6 @@ func (r *Reactor) handleMempoolMessage(ctx context.Context, envelope *p2p.Envelo
 	switch msg := envelope.Message.(type) {
 	case *protomem.Txs:
 		protoTxs := msg.GetTxs()
-		//logger.Info("PSULOG - handling mempool message", "peer", envelope.From, "txs", protoTxs)
 		if len(protoTxs) == 0 {
 			return errors.New("empty txs received from peer")
 		}

internal/state/execution.go

@@ -143,7 +143,6 @@ func (blockExec *BlockExecutor) CreateProposalBlock(
 }
 
 func (blockExec *BlockExecutor) GetTxsForKeys(txKeys []types.TxKey) types.Txs {
-	//blockExec.logger.Info("PSULOG getting txs for keys", "txKeys", txKeys)
 	return blockExec.mempool.GetTxsForKeys(txKeys)
 }
 
@@ -420,7 +419,6 @@ func (blockExec *BlockExecutor) Commit(
 func (blockExec *BlockExecutor) GetMissingTxs(txKeys []types.TxKey) []types.TxKey {
 	var missingTxKeys []types.TxKey
 	for _, txKey := range txKeys {
-		//blockExec.logger.Info("PSULOG - GetMissingTxs", "txKey", txKey, "hasTx", blockExec.mempool.HasTx(txKey))
 		if !blockExec.mempool.HasTx(txKey) {
 			missingTxKeys = append(missingTxKeys, txKey)
 		}

rpc/client/http/http.go

@@ -3,7 +3,6 @@ package http
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"time"
 
@@ -429,7 +428,6 @@ func (c *baseRPCClient) Commit(ctx context.Context, height *int64) (*coretypes.R
 
 func (c *baseRPCClient) Tx(ctx context.Context, hash bytes.HexBytes, prove bool) (*coretypes.ResultTx, error) {
 	result := new(coretypes.ResultTx)
-	fmt.Println("Calling tx search")
 	if err := c.caller.Call(ctx, "tx", &coretypes.RequestTx{Hash: hash, Prove: prove}, result); err != nil {
 		return nil, err
 	}

types/block.go

@@ -75,7 +75,7 @@ func (b *Block) ValidateBasic() error {
 	}
 
 	// NOTE: b.Data.Txs may be nil, but b.Data.Hash() still works fine.
-	if w, g := b.Data.Hash(), b.DataHash; !bytes.Equal(w, g) {
+	if w, g := b.Data.Hash(false), b.DataHash; !bytes.Equal(w, g) {
 		return fmt.Errorf("wrong Header.DataHash. Expected %X, got %X. Len of txs %d", w, g, len(b.Data.Txs))
 	}
 
@@ -99,7 +99,7 @@ func (b *Block) fillHeader() {
 		b.LastCommitHash = b.LastCommit.Hash()
 	}
 	if b.DataHash == nil {
-		b.DataHash = b.Data.Hash()
+		b.DataHash = b.Data.Hash(false)
 	}
 	if b.EvidenceHash == nil {
 		b.EvidenceHash = b.Evidence.Hash()
@@ -1298,13 +1298,16 @@ type Data struct {
 }
 
 // Hash returns the hash of the data
-func (data *Data) Hash() tmbytes.HexBytes {
+func (data *Data) Hash(overwrite bool) tmbytes.HexBytes {
 	if data == nil {
 		return (Txs{}).Hash()
 	}
-	//if data.hash == nil {
-	data.hash = data.Txs.Hash() // NOTE: leaves of merkle tree are TxIDs
-	//}
+	if data.hash != nil && overwrite {
+		data.hash = data.Txs.Hash()
+	}
+	if data.hash == nil {
+		data.hash = data.Txs.Hash() // NOTE: leaves of merkle tree are TxIDs
+	}
 	return data.hash
 }
 

types/events.go

@@ -39,7 +39,6 @@ const (
 	EventTimeoutWaitValue     = "TimeoutWait"
 	EventValidBlockValue      = "ValidBlock"
 	EventVoteValue            = "Vote"
-	EventNewProposal          = "NewProposal"
 
 	// Events emitted by the evidence reactor when evidence is validated
 	// and before it is committed

types/mempool.go

@@ -28,14 +28,6 @@ func (txKey *TxKey) ToProto() *tmproto.TxKey {
 	return tp
 }
 
-func TxKeysListToProto(txKeys []*TxKey) []*tmproto.TxKey {
-	var tps []*tmproto.TxKey
-	for _, txKey := range txKeys {
-		tps = append(tps, txKey.ToProto())
-	}
-	return tps
-}
-
 // TxKeyFromProto takes a protobuf representation of TxKey &
 // returns the native type.
 func TxKeyFromProto(dp *tmproto.TxKey) (TxKey, error) {

types/proposal.go

@@ -217,10 +217,9 @@ func ProposalFromProto(pp *tmproto.Proposal) (*Proposal, error) {
 	p.POLRound = pp.PolRound
 	p.Timestamp = pp.Timestamp
 	p.Signature = pp.Signature
-	var txKeys []TxKey
-	for _, txKey := range pp.TxKeys {
-		key, _ := TxKeyFromProto(txKey)
-		txKeys = append(txKeys, key)
+	txKeys, err := TxKeysListFromProto(pp.TxKeys)
+	if err != nil {
+		return nil, err
 	}
 	p.TxKeys = txKeys
 	header, err := HeaderFromProto(&pp.Header)