addressing review comments

Author: urvisavla

services/horizon/internal/integration/generate_ledgers_test.go

@@ -444,18 +444,8 @@ func merge(t *testing.T, networkPassphrase string, ledgers []xdr.LedgerCloseMeta
 	var curCount int
 	for _, ledger := range ledgers {
 		transactionCount := ledger.CountTransactions()
-
-		switch ledger.V {
-		case 1:
-			require.Empty(t, ledger.V1.EvictedKeys)
-			require.Empty(t, ledger.V1.UpgradesProcessing)
-		case 2:
-			require.Empty(t, ledger.V2.EvictedKeys)
-			require.Empty(t, ledger.V2.UpgradesProcessing)
-		default:
-			t.Fatalf("Invalid ledger meta version: %d", ledger.V)
-		}
-
+		require.Empty(t, ledger.V1.EvictedKeys)
+		require.Empty(t, ledger.V1.UpgradesProcessing)
 		if transactionCount == 0 {
 			continue
 		}

services/horizon/internal/integration/invokehostfunction_test.go

@@ -30,10 +30,6 @@ const constructor_contract = "soroban_constructor_contract.wasm"
 // contract code if needed to new wasm.
 
 func TestContractInvokeHostFunctionInstallContract(t *testing.T) {
-	if integration.GetCoreMaxSupportedProtocol() < 20 {
-		t.Skip("This test run does not support less than Protocol 20")
-	}
-
 	itest := integration.NewTest(t, integration.Config{
 		EnableStellarRPC: true,
 	})
@@ -79,10 +75,6 @@ func TestContractInvokeHostFunctionInstallContract(t *testing.T) {
 }
 
 func TestSorobanFeeBumpTransaction(t *testing.T) {
-	if integration.GetCoreMaxSupportedProtocol() < 20 {
-		t.Skip("This test run does not support less than Protocol 20")
-	}
-
 	itest := integration.NewTest(t, integration.Config{
 		EnableStellarRPC: true,
 	})
@@ -131,10 +123,6 @@ func TestSorobanFeeBumpTransaction(t *testing.T) {
 }
 
 func TestContractInvokeHostFunctionCreateContractByAddress(t *testing.T) {
-	if integration.GetCoreMaxSupportedProtocol() < 20 {
-		t.Skip("This test run does not support less than Protocol 20")
-	}
-
 	itest := integration.NewTest(t, integration.Config{
 		EnableStellarRPC: true,
 	})
@@ -184,10 +172,6 @@ func TestContractInvokeHostFunctionCreateContractByAddress(t *testing.T) {
 }
 
 func TestContractInvokeHostFunctionCreateConstructorContract(t *testing.T) {
-	if integration.GetCoreMaxSupportedProtocol() < 22 {
-		t.Skip("This test run does not support less than Protocol 22")
-	}
-
 	itest := integration.NewTest(t, integration.Config{
 		EnableStellarRPC: true,
 		QuickExpiration:  true,
@@ -284,10 +268,6 @@ func TestContractInvokeHostFunctionCreateConstructorContract(t *testing.T) {
 }
 
 func TestContractInvokeHostFunctionInvokeStatelessContractFn(t *testing.T) {
-	if integration.GetCoreMaxSupportedProtocol() < 20 {
-		t.Skip("This test run does not support less than Protocol 20")
-	}
-
 	itest := integration.NewTest(t, integration.Config{
 		EnableStellarRPC: true,
 	})
@@ -369,17 +349,7 @@ func TestContractInvokeHostFunctionInvokeStatelessContractFn(t *testing.T) {
 	var transactionMeta xdr.TransactionMeta
 	assert.NoError(t, xdr.SafeUnmarshalBase64(tx.ResultMetaXdr, &transactionMeta))
 
-	var returnValue xdr.ScVal
-	switch transactionMeta.V {
-	case 3:
-		returnValue = transactionMeta.MustV3().SorobanMeta.ReturnValue
-	case 4:
-		returnValue = *transactionMeta.MustV4().SorobanMeta.ReturnValue
-	default:
-		t.Fatalf("Invalid meta version: %d", transactionMeta.V)
-	}
-
-	assert.True(t, expectedScVal.Equals(returnValue))
+	assert.True(t, expectedScVal.Equals(mustGetSorobanMetaReturnValue(t, transactionMeta)))
 
 	clientInvokeOp, err := itest.Client().Operations(horizonclient.OperationRequest{
 		ForTransaction: tx.Hash,
@@ -402,11 +372,20 @@ func TestContractInvokeHostFunctionInvokeStatelessContractFn(t *testing.T) {
 	assert.Equal(t, invokeHostFunctionOpJson.Parameters[3].Type, "U64")
 }
 
-func TestContractInvokeHostFunctionInvokeStatefulContractFn(t *testing.T) {
-	if integration.GetCoreMaxSupportedProtocol() < 20 {
-		t.Skip("This test run does not support less than Protocol 20")
+func mustGetSorobanMetaReturnValue(t *testing.T, meta xdr.TransactionMeta) xdr.ScVal {
+	var returnValue xdr.ScVal
+	switch meta.V {
+	case 3:
+		returnValue = meta.MustV3().SorobanMeta.ReturnValue
+	case 4:
+		returnValue = *meta.MustV4().SorobanMeta.ReturnValue
+	default:
+		t.Fatalf("Invalid meta version: %d", meta.V)
 	}
+	return returnValue
+}
 
+func TestContractInvokeHostFunctionInvokeStatefulContractFn(t *testing.T) {
 	itest := integration.NewTest(t, integration.Config{
 		EnableStellarRPC: true,
 	})
@@ -474,16 +453,8 @@ func TestContractInvokeHostFunctionInvokeStatefulContractFn(t *testing.T) {
 	expectedScVal := xdr.ScVal{Type: xdr.ScValTypeScvU32, U32: &invokeResult}
 	var transactionMeta xdr.TransactionMeta
 	assert.NoError(t, xdr.SafeUnmarshalBase64(clientTx.ResultMetaXdr, &transactionMeta))
-	var returnValue xdr.ScVal
-	switch transactionMeta.V {
-	case 3:
-		returnValue = transactionMeta.MustV3().SorobanMeta.ReturnValue
-	case 4:
-		returnValue = *transactionMeta.MustV4().SorobanMeta.ReturnValue
-	default:
-		t.Fatalf("Invalid meta version: %d", transactionMeta.V)
-	}
-	assert.True(t, expectedScVal.Equals(returnValue))
+
+	assert.True(t, expectedScVal.Equals(mustGetSorobanMetaReturnValue(t, transactionMeta)))
 
 	clientInvokeOp, err := itest.Client().Operations(horizonclient.OperationRequest{
 		ForTransaction: tx.Hash,