revise (#255)

Signed-off-by: ReyisaRuby <yisa@reddio.com>
yu-org · Dec 23, 2024 · e446185 · e446185
1 parent b9ff970
commit e446185
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/core/kernel/handle_input.go b/core/kernel/handle_input.go
@@ -41,8 +41,6 @@ func (k *Kernel) HandleTxn(signedWrCall *protocol.SignedWrCall) error {
 
 func (k *Kernel) handleTxnLocally(stxn *SignedTxn) error {
 	metrics.KernelHandleTxnCounter.WithLabelValues().Inc()
-	k.mutex.Lock()
-	defer k.mutex.Unlock()
 	tri := k.Land.GetTripod(stxn.TripodName())
 	if tri != nil {
 		err := tri.PreTxnHandler.PreHandleTxn(stxn)

diff --git a/core/kernel/kernel.go b/core/kernel/kernel.go
@@ -2,19 +2,17 @@ package kernel
 
 import (
 	"github.com/sirupsen/logrus"
+
 	"github.com/yu-org/yu/common"
 	"github.com/yu-org/yu/config"
 	"github.com/yu-org/yu/core/env"
 	"github.com/yu-org/yu/core/tripod"
 	"github.com/yu-org/yu/core/tripod/dev"
 	"github.com/yu-org/yu/core/types"
 	"github.com/yu-org/yu/utils/ip"
-	"sync"
 )
 
 type Kernel struct {
-	mutex sync.Mutex
-
 	cfg *config.KernelConf
 
 	RunMode common.RunMode

diff --git a/core/txpool/interface.go b/core/txpool/interface.go
@@ -43,7 +43,7 @@ type ItxPool interface {
 }
 
 type IunpackedTxns interface {
-	Insert(input *SignedTxn)
+	Insert(input *SignedTxn) error
 	Deletes(txnHashes []Hash)
 	Exist(txnHash Hash) bool
 	Get(txnHash Hash) *SignedTxn

diff --git a/core/txpool/ordered.go b/core/txpool/ordered.go
@@ -1,6 +1,7 @@
 package txpool
 
 import (
+	"fmt"
 	"sync"
 
 	"github.com/sirupsen/logrus"
@@ -25,14 +26,17 @@ func newOrderedTxns() *orderedTxns {
 	}
 }
 
-func (ot *orderedTxns) Insert(input *SignedTxn) {
+func (ot *orderedTxns) Insert(input *SignedTxn) error {
 	//logrus.WithField("txpool", "ordered-txns").
 	//	Tracef("Insert txn(%s) to Txpool, txn content: %v", input.TxnHash, input.Raw.WrCall)
-
 	ot.Lock()
 	defer ot.Unlock()
+	if _, ok := ot.idx[input.TxnHash]; ok {
+		return fmt.Errorf("insert txn %s duplicated", input.TxnHash.String())
+	}
 	ot.idx[input.TxnHash] = input
 	ot.txns = append(ot.txns, input)
+	return nil
 }
 
 func (ot *orderedTxns) SetOrder(order map[int]Hash) {

diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go
@@ -93,8 +93,7 @@ func (tp *TxPool) Insert(stxn *SignedTxn) error {
 	if tp.nodeType == LightNode {
 		return nil
 	}
-	tp.unpackedTxns.Insert(stxn)
-	return nil
+	return tp.unpackedTxns.Insert(stxn)
 }
 
 func (tp *TxPool) SetOrder(order map[int]Hash) {