simplify base application and other implementations

celestiaorg · Jun 19, 2023 · 6a6a610 · 6a6a610
1 parent 842a367
commit 6a6a610
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 33 deletions.
diff --git a/abci/types/application.go b/abci/types/application.go
@@ -103,6 +103,9 @@ func (BaseApplication) ApplySnapshotChunk(req RequestApplySnapshotChunk) Respons
 func (BaseApplication) PrepareProposal(req RequestPrepareProposal) ResponsePrepareProposal {
 	squareSizeBytes := make([]byte, 8)
 	binary.BigEndian.PutUint64(squareSizeBytes, 0)
+
+	// placeholderDataHash and placeholderSquareSizeBytes are expected to be
+	// overwritten by celestia-app.
 	req.Txs = append(req.Txs, tmhash.Sum(nil), squareSizeBytes)
 	return ResponsePrepareProposal{Txs: req.Txs}
 }

diff --git a/consensus/mempool_test.go b/consensus/mempool_test.go
@@ -251,16 +251,3 @@ func (app *CounterApplication) Commit() abci.ResponseCommit {
 	binary.BigEndian.PutUint64(hash, uint64(app.txCount))
 	return abci.ResponseCommit{Data: hash}
 }
-
-func (app *CounterApplication) PrepareProposal(
-	req abci.RequestPrepareProposal) abci.ResponsePrepareProposal {
-	dataHash := types.ToTxs(req.Txs).Hash()
-	squareSize := len(req.Txs)
-	if squareSize == 0 {
-		squareSize = 1
-	}
-	squareSizeBytes := make([]byte, 8)
-	binary.BigEndian.PutUint64(squareSizeBytes, uint64(squareSize))
-	req.Txs = append(req.Txs, dataHash, squareSizeBytes)
-	return abci.ResponsePrepareProposal{Txs: req.Txs}
-}
diff --git a/test/e2e/app/app.go b/test/e2e/app/app.go
@@ -3,7 +3,6 @@ package app
 import (
 	"bytes"
 	"encoding/base64"
-	"encoding/binary"
 	"errors"
 	"fmt"
 	"os"
@@ -13,7 +12,6 @@ import (
 	"github.com/tendermint/tendermint/abci/example/code"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/log"
-	"github.com/tendermint/tendermint/types"
 	"github.com/tendermint/tendermint/version"
 )
 
@@ -259,24 +257,6 @@ func (app *Application) ApplySnapshotChunk(req abci.RequestApplySnapshotChunk) a
 	return abci.ResponseApplySnapshotChunk{Result: abci.ResponseApplySnapshotChunk_ACCEPT}
 }
 
-func (app *Application) PrepareProposal(
-	req abci.RequestPrepareProposal) abci.ResponsePrepareProposal {
-	dataHash := types.ToTxs(req.Txs).Hash()
-	squareSize := len(req.Txs)
-	if squareSize == 0 {
-		squareSize = 1
-	}
-	squareSizeBytes := make([]byte, 8)
-	binary.BigEndian.PutUint64(squareSizeBytes, uint64(squareSize))
-	req.Txs = append(req.Txs, dataHash, squareSizeBytes)
-	return abci.ResponsePrepareProposal{Txs: req.Txs}
-}
-
-func (app *Application) ProcessProposal(
-	req abci.RequestProcessProposal) abci.ResponseProcessProposal {
-	return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT}
-}
-
 func (app *Application) Rollback() error {
 	return app.state.Rollback()
 }