(fixup) Revert the CheckTxSync callback parameter from https://github…

….com/Finschia/ostracon/pull/163/files#diff-eafa5360d0b71c14dba6ad5b29be23f69f0fe93e0751fe89fe208a5dafcfbbcf
Finschia · Jul 13, 2023 · 36637c0 · 36637c0
1 parent 1552e91
commit 36637c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/consensus/replay_stubs.go b/consensus/replay_stubs.go
@@ -20,8 +20,8 @@ var _ mempl.Mempool = emptyMempool{}
 func (emptyMempool) Lock()     {}
 func (emptyMempool) Unlock()   {}
 func (emptyMempool) Size() int { return 0 }
-func (emptyMempool) CheckTxSync(_ types.Tx, _ mempl.TxInfo) (*ocabci.Response, error) {
-	return nil, nil
+func (emptyMempool) CheckTxSync(_ types.Tx, _ func(*ocabci.Response), _ mempl.TxInfo) error {
+	return nil
 }
 func (emptyMempool) CheckTxAsync(_ types.Tx, _ mempl.TxInfo, _ func(error), _ func(*ocabci.Response)) {
 }

diff --git a/mempool/clist_mempool.go b/mempool/clist_mempool.go
@@ -239,25 +239,25 @@ func (mem *CListMempool) TxsWaitChan() <-chan struct{} {
 
 // It blocks if we're waiting on Update() or Reap().
 // Safe for concurrent use by multiple goroutines.
-func (mem *CListMempool) CheckTxSync(tx types.Tx, txInfo TxInfo) (res *ocabci.Response, err error) {
+func (mem *CListMempool) CheckTxSync(tx types.Tx, cb func(*ocabci.Response), txInfo TxInfo) error {
 	mem.updateMtx.RLock()
 	// use defer to unlock mutex because application (*local client*) might panic
 	defer mem.updateMtx.RUnlock()
 
-	if err = mem.prepareCheckTx(tx, txInfo); err != nil {
-		return res, err
+	if err := mem.prepareCheckTx(tx, txInfo); err != nil {
+		return err
 	}
 
 	// CONTRACT: `app.CheckTxSync()` should check whether `GasWanted` is valid (0 <= GasWanted <= block.masGas)
 	var r *ocabci.ResponseCheckTx
-	r, err = mem.proxyAppConn.CheckTxSync(abci.RequestCheckTx{Tx: tx})
+	r, err := mem.proxyAppConn.CheckTxSync(abci.RequestCheckTx{Tx: tx})
 	if err != nil {
-		return res, err
+		return err
 	}
 
-	res = ocabci.ToResponseCheckTx(*r)
-	mem.reqResCb(tx, txInfo.SenderID, txInfo.SenderP2PID, res, nil)
-	return res, err
+	res := ocabci.ToResponseCheckTx(*r)
+	mem.reqResCb(tx, txInfo.SenderID, txInfo.SenderP2PID, res, cb)
+	return err
 }
 
 // cb: A callback from the CheckTx command.

diff --git a/mempool/mempool.go b/mempool/mempool.go
@@ -17,7 +17,7 @@ import (
 type Mempool interface {
 	// CheckTx executes a new transaction against the application to determine
 	// its validity and whether it should be added to the mempool.
-	CheckTxSync(tx types.Tx, txInfo TxInfo) (*ocabci.Response, error)
+	CheckTxSync(tx types.Tx, checkTxCb func(*ocabci.Response), txInfo TxInfo) error
 	CheckTxAsync(tx types.Tx, txInfo TxInfo, prepareCb func(error), checkTxCb func(*ocabci.Response))
 
 	// ReapMaxBytesMaxGas reaps transactions from the mempool up to maxBytes