updated integration tests to use gasschedule v4 #3798
Conversation
Codecov Report
@@ Coverage Diff @@
## development #3798 +/- ##
===============================================
- Coverage 74.62% 74.62% -0.01%
===============================================
Files 606 606
Lines 79672 79672
===============================================
- Hits 59457 59455 -2
- Misses 15640 15641 +1
- Partials 4575 4576 +1
Continue to review full report at Codecov.
|
| @@ -308,7 +309,7 @@ func TestMultipleTimesERC20BigIntInBatches(t *testing.T) { | |||
| t.Skip("this is not a short test") | |||
| } | |||
|
|
|||
| gasSchedule, _ := common.LoadGasScheduleConfig("../../../../cmd/node/config/gasSchedules/gasScheduleV2.toml") | |||
| gasSchedule, _ := common.LoadGasScheduleConfig(arwen.GasSchedulePath) | |||
| @@ -1,3 +1,4 @@ | |||
| //go:build !race | |||
There was a problem hiding this comment.
Arwen should be ok now. Maybe remove these pre-processor lines along with the following TODO?
Valid on all files
There was a problem hiding this comment.
removed from all files in integrationstests/vm
There was a problem hiding this comment.
seems not to be ready yet... undid the remove
integrationTests/vm/arwen/utils.go
Outdated
| @@ -66,7 +66,7 @@ var oneShardCoordinator = mock.NewMultiShardsCoordinatorMock(2) | |||
| var pkConverter, _ = pubkeyConverter.NewHexPubkeyConverter(32) | |||
|
|
|||
| // GasSchedulePath -- | |||
| var GasSchedulePath = "../../../../cmd/node/config/gasSchedules/gasScheduleV2.toml" | |||
| var GasSchedulePath = "../../../../cmd/node/config/gasSchedules/gasScheduleV4.toml" | |||
There was a problem hiding this comment.
this util package.... I think we can move this var (that can be a const, actually) in the integrationTests/testInitializer.go and we can slowly dissolve this file
…lev4-improvement # Conflicts: # integrationTests/vm/arwen/arwenvm/gasSchedule_test.go
…4-improvement updated integration tests to use gasschedule v4 improvement
| @@ -118,12 +120,12 @@ func TestDelegation_Claims(t *testing.T) { | |||
| context.GasLimit = 30000000 | |||
| err = context.ExecuteSC(&context.Alice, "claimRewards") | |||
| require.Nil(t, err) | |||
| require.Equal(t, 22313926, int(context.LastConsumedFee)) | |||
| require.Equal(t, 8148760, int(context.LastConsumedFee)) | |||
| @@ -20,9 +22,9 @@ func TestDNS_Register(t *testing.T) { | |||
|
|
|||
| var empty struct{} | |||
| arwen.DNSAddresses[string(expectedDNSAddress)] = empty | |||
| arwen.GasSchedulePath = "../../../cmd/node/config/gasSchedules/gasScheduleV2.toml" | |||
| gasScheduleConfigPath := strings.ReplaceAll(integrationTests.GasSchedulePath, "../../../..", "../../..") | |||
There was a problem hiding this comment.
Quite tricky.
We could have used filepath.Abs() in the definition of integrationTests.GasSchedulePath and never worry about relative paths when using it in other packages.
There was a problem hiding this comment.
talk about it, and can remain like this for now
just integration test changes