Fix failing tests

mock/contracts/deployerSimpleSC.go

@@ -57,6 +57,12 @@ func InitMockMethod(instanceMock *mock.InstanceMock, config interface{}) {
 	instanceMock.AddMockMethod("init", testcommon.SimpleWasteGasMockMethod(instanceMock, testConfig.GasUsedByInit))
 }
 
+// UpgradeMockMethod -
+func UpgradeMockMethod(instanceMock *mock.InstanceMock, config interface{}) {
+	testConfig := config.(*testcommon.TestConfig)
+	instanceMock.AddMockMethod("upgrade", testcommon.SimpleWasteGasMockMethod(instanceMock, testConfig.GasUsedByInit))
+}
+
 // CallbackTestConfig -
 type CallbackTestConfig interface {
 	CallbackFails() bool

test/contracts/init-correct/init-correct.c

@@ -27,3 +27,7 @@ void init() {
 		}
 	}
 }
+
+void upgrade() {
+	init();
+}

test/contracts/init-correct/init-correct.export

@@ -1 +1,2 @@
 init
+upgrade

vmhost/hosttest/contracts_deploy_test.go

@@ -386,9 +386,14 @@ func runUpdateFromSourceTest(t *testing.T, testConfig *testcommon.TestConfig, as
 	var deployedContract test.MockTestSmartContract
 	var contractToUpdate test.MockTestSmartContract
 	if testConfig.DeployedContractAddress != nil {
+		// The DeployedContract will be the source of the code to be written in
+		// ContractToBeUpdated. Therefore it is the DeployedContract which must
+		// initially have UpgradeMockMethod. After the code update, the
+		// ContractToBeUpdated will also have the UpgradeMockMethod and it will be
+		// called by the VM.
 		deployedContract = test.CreateMockContract(testConfig.DeployedContractAddress).
 			WithConfig(testConfig).
-			WithMethods(contracts.InitMockMethod)
+			WithMethods(contracts.InitMockMethod, contracts.UpgradeMockMethod)
 	}
 	if testConfig.ContractToBeUpdatedAddress != nil {
 		contractToUpdate = test.CreateMockContract(testConfig.ContractToBeUpdatedAddress).

vmhost/hosttest/execution_test.go

@@ -185,7 +185,7 @@ func TestExecution_DeployWASM_Successful(t *testing.T) {
 		AndAssertResults(func(blockchainHook *contextmock.BlockchainHookStub, verify *test.VMOutputVerifier) {
 			verify.Ok().
 				ReturnData([]byte("init successful")).
-				GasRemaining(430).
+				GasRemaining(410).
 				Nonce([]byte("caller"), 24).
 				Code(newAddress, input.ContractCode).
 				BalanceDelta(newAddress, 88)
@@ -449,7 +449,7 @@ func TestExecution_Deploy_DisallowFloatingPoint(t *testing.T) {
 
 func TestExecution_DeployWASM_GasValidation(t *testing.T) {
 	var gasProvided uint64
-	gasUsedByDeployment := uint64(570)
+	gasUsedByDeployment := uint64(590)
 
 	inputBuilder := test.CreateTestContractCreateInputBuilder().
 		WithContractCode(test.GetTestSCCode("init-correct", "../../")).
@@ -2983,13 +2983,13 @@ func TestExecution_CreateNewContract_Success(t *testing.T) {
 		AndAssertResults(func(host vmhost.VMHost, stubBlockchainHook *contextmock.BlockchainHookStub, verify *test.VMOutputVerifier) {
 			verify.Ok().
 				Balance(test.ParentAddress, 1000).
-				GasUsed(test.ParentAddress, 1069).
-				GasRemaining(998361).
+				GasUsed(test.ParentAddress, 1109).
+				GasRemaining(998301).
 				BalanceDelta(childAddress, 42).
 				Code(childAddress, childCode).
 				CodeMetadata(childAddress, []byte{1, 0}).
 				CodeDeployerAddress(childAddress, test.ParentAddress).
-				GasUsed(childAddress, 570).
+				GasUsed(childAddress, 590).
 				ReturnData([]byte{byte(l / 256), byte(l % 256)}, []byte("init successful"), []byte("succ")).
 				Storage().
 				Logs(vmcommon.LogEntry{