rename MaxAccountNestedObjects => MaxAPIResourcesPerAccount

api/converter_utils.go

@@ -635,9 +635,9 @@ func (si *ServerImplementation) transactionParamsToTransactionFilter(params gene
 	return
 }
 
-func (si *ServerImplementation) maxAccountsErrorToAccountsErrorResponse(maxErr idb.MaxAccountNestedObjectsError) generated.AccountsErrorResponse {
+func (si *ServerImplementation) maxAccountsErrorToAccountsErrorResponse(maxErr idb.MaxAPIResourcesPerAccountError) generated.AccountsErrorResponse {
 	addr := maxErr.Address.String()
-	max := uint64(si.opts.MaxAccountNestedObjects)
+	max := uint64(si.opts.MaxAPIResourcesPerAccount)
 	return generated.AccountsErrorResponse{
 		Message:            "Result limit exceeded",
 		MaxResults:         &max,

api/handlers.go

@@ -176,7 +176,7 @@ func (si *ServerImplementation) LookupAccountByID(ctx echo.Context, accountID st
 		IncludeAppParams:     true,
 		Limit:                1,
 		IncludeDeleted:       boolOrDefault(params.IncludeAll),
-		MaxResources:         uint64(si.opts.MaxAccountNestedObjects),
+		MaxResources:         uint64(si.opts.MaxAPIResourcesPerAccount),
 	}
 
 	if params.Exclude != nil {
@@ -188,7 +188,7 @@ func (si *ServerImplementation) LookupAccountByID(ctx echo.Context, accountID st
 
 	accounts, round, err := si.fetchAccounts(ctx.Request().Context(), options, params.Round)
 	if err != nil {
-		var maxErr idb.MaxAccountNestedObjectsError
+		var maxErr idb.MaxAPIResourcesPerAccountError
 		if errors.As(err, &maxErr) {
 			return ctx.JSON(http.StatusBadRequest, si.maxAccountsErrorToAccountsErrorResponse(maxErr))
 		}
@@ -352,7 +352,7 @@ func (si *ServerImplementation) SearchForAccounts(ctx echo.Context, params gener
 		HasAppID:             uintOrDefault(params.ApplicationId),
 		EqualToAuthAddr:      spendingAddr[:],
 		IncludeDeleted:       boolOrDefault(params.IncludeAll),
-		MaxResources:         uint64(si.opts.MaxAccountNestedObjects),
+		MaxResources:         uint64(si.opts.MaxAPIResourcesPerAccount),
 	}
 
 	if params.Exclude != nil {
@@ -381,7 +381,7 @@ func (si *ServerImplementation) SearchForAccounts(ctx echo.Context, params gener
 
 	accounts, round, err := si.fetchAccounts(ctx.Request().Context(), options, params.Round)
 	if err != nil {
-		var maxErr idb.MaxAccountNestedObjectsError
+		var maxErr idb.MaxAPIResourcesPerAccountError
 		if errors.As(err, &maxErr) {
 			return ctx.JSON(http.StatusBadRequest, si.maxAccountsErrorToAccountsErrorResponse(maxErr))
 		}

api/handlers_e2e_test.go

@@ -428,7 +428,7 @@ func TestAccountMaxResultsLimit(t *testing.T) {
 	serverCtx, serverCancel := context.WithCancel(context.Background())
 	defer serverCancel()
 	opts := defaultOpts
-	opts.MaxAccountNestedObjects = uint64(maxResults)
+	opts.MaxAPIResourcesPerAccount = uint64(maxResults)
 	listenAddr := "localhost:8989"
 	go Serve(serverCtx, listenAddr, db, nil, logrus.New(), opts)
 

api/server.go

@@ -38,10 +38,10 @@ type ExtraOptions struct {
 	// ReadTimeout is the maximum duration for reading the entire request, including the body.
 	ReadTimeout time.Duration
 
-	// MaxAccountNestedObjects is the maximum number of combined AppParams, AppLocalState, AssetParams,
+	// MaxAPIResourcesPerAccount is the maximum number of combined AppParams, AppLocalState, AssetParams,
 	// and AssetHolding resources per address that can be returned by the /v2/accounts endpoints.
 	// If an address exceeds this number, a 400 error is returned. Zero means unlimited.
-	MaxAccountNestedObjects uint64
+	MaxAPIResourcesPerAccount uint64
 
 	/////////////////////
 	// Limit Constants //

cmd/algorand-indexer/daemon.go

@@ -35,7 +35,7 @@ var (
 	writeTimeout             time.Duration
 	readTimeout              time.Duration
 	maxConn                  uint32
-	maxAccountNestedObjects  uint32
+	maxAPIResourcesPerAccount  uint32
 	maxTransactionsLimit     uint32
 	defaultTransactionsLimit uint32
 	maxAccountsLimit         uint32
@@ -159,7 +159,7 @@ func init() {
 	daemonCmd.Flags().DurationVarP(&readTimeout, "read-timeout", "", 5*time.Second, "set the maximum duration for reading the entire request")
 	daemonCmd.Flags().Uint32VarP(&maxConn, "max-conn", "", 0, "set the maximum connections allowed in the connection pool, if the maximum is reached subsequent connections will wait until a connection becomes available, or timeout according to the read-timeout setting")
 
-	daemonCmd.Flags().Uint32VarP(&maxAccountNestedObjects, "max-account-nested-objects", "", 0, "set the max # of combined apps and assets per account supported by /v2/accounts API calls before a 400 error is returned (default: unlimited)")
+	daemonCmd.Flags().Uint32VarP(&maxAPIResourcesPerAccount, "max-account-nested-objects", "", 0, "set the max # of combined apps and assets per account supported by /v2/accounts API calls before a 400 error is returned (default: unlimited)")
 
 	daemonCmd.Flags().Uint32VarP(&maxTransactionsLimit, "max-transactions-limit", "", 10000, "set the maximum allowed Limit parameter for querying transactions")
 	daemonCmd.Flags().Uint32VarP(&defaultTransactionsLimit, "default-transactions-limit", "", 1000, "set the default Limit parameter for querying transactions, if none is provided")
@@ -199,7 +199,7 @@ func makeOptions() (options api.ExtraOptions) {
 	options.WriteTimeout = writeTimeout
 	options.ReadTimeout = readTimeout
 
-	options.MaxAccountNestedObjects = uint64(maxAccountNestedObjects)
+	options.MaxAPIResourcesPerAccount = uint64(maxAPIResourcesPerAccount)
 	options.MaxTransactionsLimit = uint64(maxTransactionsLimit)
 	options.DefaultTransactionsLimit = uint64(defaultTransactionsLimit)
 	options.MaxAccountsLimit = uint64(maxAccountsLimit)

idb/idb.go

@@ -275,17 +275,17 @@ type AccountQueryOptions struct {
 // AccountRow is metadata relating to one account in a account query.
 type AccountRow struct {
 	Account models.Account
-	Error   error // could be MaxAccountNestedObjectsError
+	Error   error // could be MaxAPIResourcesPerAccountError
 }
 
-// MaxAccountNestedObjectsError records the offending address and resource count that exceeded the limit.
-type MaxAccountNestedObjectsError struct {
+// MaxAPIResourcesPerAccountError records the offending address and resource count that exceeded the limit.
+type MaxAPIResourcesPerAccountError struct {
 	Address basics.Address
 
 	TotalAppLocalStates, TotalAppParams, TotalAssets, TotalAssetParams uint64
 }
 
-func (e MaxAccountNestedObjectsError) Error() string {
+func (e MaxAPIResourcesPerAccountError) Error() string {
 	return "Max accounts API results limit exceeded"
 }
 

idb/postgres/postgres.go

@@ -1813,7 +1813,7 @@ func (db *IndexerDb) checkAccountResourceLimit(ctx context.Context, tx pgx.Tx, o
 		if resultCount > opts.MaxResources {
 			var aaddr basics.Address
 			copy(aaddr[:], addr)
-			return idb.MaxAccountNestedObjectsError{
+			return idb.MaxAPIResourcesPerAccountError{
 				Address:             aaddr,
 				TotalAppLocalStates: totalAppLocalStates,
 				TotalAppParams:      totalAppParams,