Comments fix

0xPolygon · Oct 26, 2023 · a6c7921 · a6c7921
1 parent 3517140
commit a6c7921
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 20 deletions.
diff --git a/jsonrpc/debug_endpoint.go b/jsonrpc/debug_endpoint.go
@@ -255,7 +255,7 @@ func newTracer(config *TraceConfig) (
 	var tracer tracer.Tracer
 
 	if config.Tracer == callTracerName {
-		tracer = calltracer.NewCallTracer()
+		tracer = &calltracer.CallTracer{}
 	} else {
 		tracer = structtracer.NewStructTracer(structtracer.Config{
 			EnableMemory:     config.EnableMemory && !config.DisableStructLogs,

diff --git a/state/runtime/tracer/calltracer/call_tracer.go b/state/runtime/tracer/calltracer/call_tracer.go
@@ -41,17 +41,11 @@ type CallTracer struct {
 	activeGas          uint64
 	activeAvailableGas uint64
 
-	cancelLock *sync.Mutex
+	cancelLock sync.Mutex
 	reason     error
 	stop       bool
 }
 
-func NewCallTracer() *CallTracer {
-	return &CallTracer{
-		cancelLock: &sync.Mutex{},
-	}
-}
-
 func (c *CallTracer) Cancel(err error) {
 	c.cancelLock.Lock()
 	defer c.cancelLock.Unlock()
@@ -73,6 +67,13 @@ func (c *CallTracer) Clear() {
 }
 
 func (c *CallTracer) GetResult() (interface{}, error) {
+	c.cancelLock.Lock()
+	defer c.cancelLock.Unlock()
+
+	if c.reason != nil {
+		return nil, c.reason
+	}
+
 	return c.call, nil
 }
 
@@ -124,7 +125,7 @@ func (c *CallTracer) CallStart(depth int, from, to types.Address, callType int,
 func (c *CallTracer) CallEnd(depth int, output []byte, err error) {
 	c.activeCall.Output = hex.EncodeToHex(output)
 
-	var gasUsed uint64 = 0
+	gasUsed := uint64(0)
 
 	if c.activeCall.startGas > c.activeAvailableGas {
 		gasUsed = c.activeCall.startGas - c.activeAvailableGas

diff --git a/state/runtime/tracer/calltracer/call_tracer_test.go b/state/runtime/tracer/calltracer/call_tracer_test.go
@@ -15,7 +15,7 @@ func TestCallTracer_Cancel(t *testing.T) {
 
 	err := errors.New("timeout")
 
-	tracer := NewCallTracer()
+	tracer := &CallTracer{}
 
 	require.Nil(t, tracer.reason)
 	require.False(t, tracer.stop)
@@ -31,7 +31,7 @@ func TestCallTracer_Cancel(t *testing.T) {
 func TestCallTracer_Clear(t *testing.T) {
 	t.Parallel()
 
-	tracer := NewCallTracer()
+	tracer := &CallTracer{}
 	tracer.call = &Call{}
 
 	tracer.Clear()
@@ -46,7 +46,7 @@ func TestCallTracer_CallStart(t *testing.T) {
 	t.Run("call_start_initializes_call_object", func(t *testing.T) {
 		t.Parallel()
 
-		c := NewCallTracer()
+		c := &CallTracer{}
 
 		var (
 			depth    = 1
@@ -79,7 +79,7 @@ func TestCallTracer_CallStart(t *testing.T) {
 	t.Run("call_start_sets_parent_when_depth_greater_than_1", func(t *testing.T) {
 		t.Parallel()
 
-		c := NewCallTracer()
+		c := &CallTracer{}
 
 		var (
 			depth    = 2
@@ -128,7 +128,7 @@ func TestCallTracer_CallStart(t *testing.T) {
 	t.Run("call_start_handles_nil_value_parameter_for_value_and_input", func(t *testing.T) {
 		t.Parallel()
 
-		c := NewCallTracer()
+		c := &CallTracer{}
 
 		var (
 			depth    = 1
@@ -159,7 +159,7 @@ func TestCallTracer_CallStart(t *testing.T) {
 	t.Run("call_start_handles_unknown_call_type", func(t *testing.T) {
 		t.Parallel()
 
-		c := NewCallTracer()
+		c := &CallTracer{}
 
 		var (
 			depth    = 1
@@ -199,7 +199,7 @@ func TestCallTracer_CallEnd(t *testing.T) {
 	t.Run("call_end_when_depth_is_1_no_error_activeAvailableGas_higher_than_start_gas", func(t *testing.T) {
 		t.Parallel()
 
-		tracer := NewCallTracer()
+		tracer := &CallTracer{}
 		tracer.activeAvailableGas = 2000
 		tracer.activeCall = &Call{
 			startGas: 1000,
@@ -215,7 +215,7 @@ func TestCallTracer_CallEnd(t *testing.T) {
 	t.Run("call_end_when_depth_is_1_error_activeAvailableGas_higher_than_start_gas", func(t *testing.T) {
 		t.Parallel()
 
-		tracer := NewCallTracer()
+		tracer := &CallTracer{}
 		tracer.activeAvailableGas = 2000
 		tracer.activeCall = &Call{
 			startGas: 1000,
@@ -233,7 +233,7 @@ func TestCallTracer_CallEnd(t *testing.T) {
 	t.Run("call_end_when_depth_is_1_no_error_activeAvailableGas_lower_than_start_gas", func(t *testing.T) {
 		t.Parallel()
 
-		tracer := NewCallTracer()
+		tracer := &CallTracer{}
 		tracer.activeAvailableGas = 1000
 		tracer.activeCall = &Call{
 			startGas: 2000,
@@ -249,7 +249,7 @@ func TestCallTracer_CallEnd(t *testing.T) {
 	t.Run("call_end_when_depth_is_1_error_activeAvailableGas_lower_than_start_gas", func(t *testing.T) {
 		t.Parallel()
 
-		tracer := NewCallTracer()
+		tracer := &CallTracer{}
 		tracer.activeAvailableGas = 1000
 		tracer.activeCall = &Call{
 			startGas: 2000,
@@ -267,7 +267,7 @@ func TestCallTracer_CallEnd(t *testing.T) {
 	t.Run("call_end_when_depth_is_2_no_error", func(t *testing.T) {
 		t.Parallel()
 
-		tracer := NewCallTracer()
+		tracer := &CallTracer{}
 		tracer.activeAvailableGas = 2000
 		tracer.activeCall = &Call{
 			startGas: 1000,