Added nil err check

smartcontractkit · Oct 3, 2024 · 2dd8974 · 2dd8974
1 parent 65e58b0
commit 2dd8974
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/core/services/relay/evm/evmtesting/run_tests.go b/core/services/relay/evm/evmtesting/run_tests.go
@@ -151,7 +151,7 @@ func RunContractReaderEvmTests[T TestingT[T]](t T, it *EVMChainComponentsInterfa
 
 func RunContractReaderInLoopTests[T TestingT[T]](t T, it ChainComponentsInterfaceTester[T]) {
 	RunContractReaderInterfaceTests[T](t, it, false)
-
+	 
 	it.Setup(t)
 	ctx := tests.Context(t)
 	cr := it.GetContractReader(t)

diff --git a/core/services/relay/evm/read/event.go b/core/services/relay/evm/read/event.go
@@ -240,17 +240,19 @@ func (b *EventBinding) GetLatestValue(ctx context.Context, address common.Addres
 	)
 
 	defer func() {
-		callErr := newErrorFromCall(err, Call{
-			ContractAddress: address,
-			ContractName:    b.contractName,
-			MethodName:      b.eventName,
-			Params:          params,
-			ReturnVal:       into,
-		}, strconv.Itoa(int(confs)), false)
+		if err != nil {
+			callErr := newErrorFromCall(err, Call{
+				ContractAddress: address,
+				ContractName:    b.contractName,
+				MethodName:      b.eventName,
+				Params:          params,
+				ReturnVal:       into,
+			}, strconv.Itoa(int(confs)), false)
 
-		callErr.Result = result
+			callErr.Result = result
 
-		err = callErr
+			err = callErr
+		}
 	}()
 
 	if err = b.validateBound(address); err != nil {
@@ -303,11 +305,13 @@ func (b *EventBinding) GetLatestValue(ctx context.Context, address common.Addres
 
 func (b *EventBinding) QueryKey(ctx context.Context, address common.Address, filter query.KeyFilter, limitAndSort query.LimitAndSort, sequenceDataType any) (sequences []commontypes.Sequence, err error) {
 	defer func() {
-		err = newErrorFromCall(err, Call{
-			ContractAddress: address,
-			ContractName:    b.contractName,
-			MethodName:      b.eventName,
-		}, "", false)
+		if err != nil {
+			err = newErrorFromCall(err, Call{
+				ContractAddress: address,
+				ContractName:    b.contractName,
+				MethodName:      b.eventName,
+			}, "", false)
+		}
 	}()
 
 	if err = b.validateBound(address); err != nil {