Rename a few more symbols/strings

stellar · Oct 16, 2023 · 3fcefd3 · 3fcefd3
1 parent dc8a5c3
commit 3fcefd3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/ingest/stats_change_processor.go b/ingest/stats_change_processor.go
@@ -197,8 +197,8 @@ func (stats *StatsChangeProcessorResults) Map() map[string]interface{} {
 		"stats_config_settings_updated": stats.ConfigSettingsUpdated,
 		"stats_config_settings_removed": stats.ConfigSettingsRemoved,
 
-		"stats_expiration_created": stats.TtlCreated,
-		"stats_expiration_updated": stats.TtlUpdated,
-		"stats_expiration_removed": stats.TtlRemoved,
+		"stats_ttl_created": stats.TtlCreated,
+		"stats_ttl_updated": stats.TtlUpdated,
+		"stats_ttl_removed": stats.TtlRemoved,
 	}
 }
diff --git a/services/horizon/internal/ingest/processors/operations_processor.go b/services/horizon/internal/ingest/processors/operations_processor.go
@@ -688,7 +688,7 @@ func (operation *transactionOperationWrapper) Details() (map[string]interface{},
 		}
 	case xdr.OperationTypeExtendFootprintTtl:
 		op := operation.operation.Body.MustExtendFootprintTtlOp()
-		details["ledgers_to_expire"] = op.ExtendTo
+		details["extend_to"] = op.ExtendTo
 	case xdr.OperationTypeRestoreFootprint:
 	default:
 		panic(fmt.Errorf("unknown operation type: %s", operation.OperationType()))

diff --git a/services/horizon/internal/ingest/verify.go b/services/horizon/internal/ingest/verify.go
@@ -243,12 +243,12 @@ func (s *system) verifyState(verifyAgainstLatestCheckpoint bool) error {
 				}
 				totalByType["contract_data"]++
 			case xdr.LedgerEntryTypeTtl:
-				// we don't store expiration entries in the db,
+				// we don't store ttl entries in the db,
 				// so there is nothing to verify in that case.
 				if err = verifier.Write(entry); err != nil {
 					return err
 				}
-				totalByType["expiration"]++
+				totalByType["ttl"]++
 			default:
 				return errors.New("GetLedgerEntries return unexpected type")
 			}
@@ -322,7 +322,7 @@ func (s *system) verifyState(verifyAgainstLatestCheckpoint bool) error {
 
 	err = verifier.Verify(
 		countAccounts + countData + countOffers + countTrustLines + countClaimableBalances +
-			countLiquidityPools + int(totalByType["contract_data"]) + int(totalByType["expiration"]),
+			countLiquidityPools + int(totalByType["contract_data"]) + int(totalByType["ttl"]),
 	)
 	if err != nil {
 		return errors.Wrap(err, "verifier.Verify failed")

diff --git a/services/horizon/internal/integration/db_test.go b/services/horizon/internal/integration/db_test.go
@@ -167,18 +167,18 @@ func submitSorobanOps(itest *integration.Test, tt *assert.Assertions) (submitted
 	installContractOp := assembleInstallContractCodeOp(itest.CurrentTest(), itest.Master().Address(), add_u64_contract)
 	itest.MustSubmitOperations(itest.MasterAccount(), itest.Master(), installContractOp)
 
-	bumpFootprintExpirationOp := &txnbuild.ExtendFootprintTtl{
+	extendFootprintTtlOp := &txnbuild.ExtendFootprintTtl{
 		ExtendTo:      100,
 		SourceAccount: itest.Master().Address(),
 	}
-	itest.MustSubmitOperations(itest.MasterAccount(), itest.Master(), bumpFootprintExpirationOp)
+	itest.MustSubmitOperations(itest.MasterAccount(), itest.Master(), extendFootprintTtlOp)
 
 	restoreFootprintOp := &txnbuild.RestoreFootprint{
 		SourceAccount: itest.Master().Address(),
 	}
 	txResp := itest.MustSubmitOperations(itest.MasterAccount(), itest.Master(), restoreFootprintOp)
 
-	return []txnbuild.Operation{installContractOp, bumpFootprintExpirationOp, restoreFootprintOp}, txResp.Ledger
+	return []txnbuild.Operation{installContractOp, extendFootprintTtlOp, restoreFootprintOp}, txResp.Ledger
 }
 
 func submitSponsorshipOps(itest *integration.Test, tt *assert.Assertions) (submittedOperations []txnbuild.Operation, lastLedger int32) {

diff --git a/xdr/ledger_entry.go b/xdr/ledger_entry.go
@@ -174,7 +174,7 @@ func (data *LedgerEntryData) LedgerKey() (LedgerKey, error) {
 			return key, err
 		}
 	case LedgerEntryTypeTtl:
-		if err := key.SetExpiration(data.Ttl.KeyHash); err != nil {
+		if err := key.SetTtl(data.Ttl.KeyHash); err != nil {
 			return key, err
 		}
 	default:

diff --git a/xdr/ledger_key.go b/xdr/ledger_key.go
@@ -188,9 +188,9 @@ func (key *LedgerKey) SetConfigSetting(configSettingID ConfigSettingId) error {
 	return nil
 }
 
-// SetExpiration mutates `key` such that it represents the identity of an
+// SetTtl mutates `key` such that it represents the identity of an
 // expiration entry.
-func (key *LedgerKey) SetExpiration(keyHash Hash) error {
+func (key *LedgerKey) SetTtl(keyHash Hash) error {
 	data := LedgerKeyTtl{
 		KeyHash: keyHash,
 	}