Merge #4171

4171: Fix system contract variable name inconsistency r=janezpodhostnik a=janezpodhostnik

Continuing to dissect this PR #3736 into smaller chunks.

This is just a naming inconsistency fix.

Co-authored-by: Janez Podhostnik <[email protected]>

Author: bors[bot]

fvm/environment/system_contracts.go

@@ -157,7 +157,7 @@ func (sys *SystemContracts) DeductTransactionFees(
 // uses `FlowServiceAccount.setupNewAccount` from https://github.com/onflow/flow-core-contracts/blob/master/contracts/FlowServiceAccount.cdc
 var setupNewAccountSpec = ContractFunctionSpec{
 	AddressFromChain: ServiceAddress,
-	LocationName:     systemcontracts.ContractServiceAccount,
+	LocationName:     systemcontracts.ContractNameServiceAccount,
 	FunctionName:     systemcontracts.ContractServiceAccountFunction_setupNewAccount,
 	ArgumentTypes: []sema.Type{
 		sema.AuthAccountType,
@@ -182,7 +182,7 @@ func (sys *SystemContracts) SetupNewAccount(
 
 var accountAvailableBalanceSpec = ContractFunctionSpec{
 	AddressFromChain: ServiceAddress,
-	LocationName:     systemcontracts.ContractStorageFees,
+	LocationName:     systemcontracts.ContractNameStorageFees,
 	FunctionName:     systemcontracts.ContractStorageFeesFunction_defaultTokenAvailableBalance,
 	ArgumentTypes: []sema.Type{
 		&sema.AddressType{},
@@ -204,7 +204,7 @@ func (sys *SystemContracts) AccountAvailableBalance(
 
 var accountBalanceInvocationSpec = ContractFunctionSpec{
 	AddressFromChain: ServiceAddress,
-	LocationName:     systemcontracts.ContractServiceAccount,
+	LocationName:     systemcontracts.ContractNameServiceAccount,
 	FunctionName:     systemcontracts.ContractServiceAccountFunction_defaultTokenBalance,
 	ArgumentTypes: []sema.Type{
 		sema.PublicAccountType,
@@ -226,7 +226,7 @@ func (sys *SystemContracts) AccountBalance(
 
 var accountStorageCapacitySpec = ContractFunctionSpec{
 	AddressFromChain: ServiceAddress,
-	LocationName:     systemcontracts.ContractStorageFees,
+	LocationName:     systemcontracts.ContractNameStorageFees,
 	FunctionName:     systemcontracts.ContractStorageFeesFunction_calculateAccountCapacity,
 	ArgumentTypes: []sema.Type{
 		&sema.AddressType{},
@@ -260,7 +260,7 @@ func (sys *SystemContracts) AccountsStorageCapacity(
 	return sys.Invoke(
 		ContractFunctionSpec{
 			AddressFromChain: ServiceAddress,
-			LocationName:     systemcontracts.ContractStorageFees,
+			LocationName:     systemcontracts.ContractNameStorageFees,
 			FunctionName:     systemcontracts.ContractStorageFeesFunction_getAccountsCapacityForTransactionStorageCheck,
 			ArgumentTypes: []sema.Type{
 				sema.NewConstantSizedType(

fvm/systemcontracts/system_contracts.go

@@ -23,12 +23,12 @@ const (
 
 	// Unqualified names of system smart contracts (not including address prefix)
 
-	ContractNameEpoch      = "FlowEpoch"
-	ContractNameClusterQC  = "FlowClusterQC"
-	ContractNameDKG        = "FlowDKG"
-	ContractServiceAccount = "FlowServiceAccount"
-	ContractNameFlowFees   = "FlowFees"
-	ContractStorageFees    = "FlowStorageFees"
+	ContractNameEpoch          = "FlowEpoch"
+	ContractNameClusterQC      = "FlowClusterQC"
+	ContractNameDKG            = "FlowDKG"
+	ContractNameServiceAccount = "FlowServiceAccount"
+	ContractNameFlowFees       = "FlowFees"
+	ContractNameStorageFees    = "FlowStorageFees"
 
 	// Unqualified names of service events (not including address prefix or contract name)