删掉快速编辑目标校验里已失效的 generationInputs 形参
- `ensure_editor_image_edit_target_matches_source` 的 `generation_inputs` 形参在来源类型判据改为静态图集合、且 AGC 例外分支删除后再无任何使用,函数体内已无引用 - 同步删除该形参,并更新 1 处生产调用点与 8 处用例调用点传入的多余实参 - 该形参此前只用于把 generationInputs 透传给已删除的 `_for_request` 包装层,删除后判据与请求体字段彻底解耦
This commit is contained in:
@@ -4320,7 +4320,6 @@ fn ensure_editor_image_edit_target_matches_source(
|
||||
source_asset_object_id: Option<&str>,
|
||||
source_asset_kind: Option<&str>,
|
||||
target: &EditorImageEditTargetLayerSource,
|
||||
generation_inputs: Option<&Value>,
|
||||
) -> Result<(), AppError> {
|
||||
let same_object = match (source_asset_object_id, target.asset_object_id.as_deref()) {
|
||||
(Some(source_id), Some(target_id)) => source_id == target_id,
|
||||
@@ -4543,7 +4542,6 @@ async fn resolve_editor_image_edit_source(
|
||||
asset_object_id.as_deref(),
|
||||
source_asset_kind.as_deref(),
|
||||
&source,
|
||||
payload.generation_inputs.as_ref(),
|
||||
)?;
|
||||
Ok(EditorImageEditResolvedSource {
|
||||
reference_kind,
|
||||
@@ -20839,7 +20837,6 @@ mod tests {
|
||||
Some("object-source"),
|
||||
Some("character"),
|
||||
&target,
|
||||
None,
|
||||
)
|
||||
.is_ok(),
|
||||
"素材 ID 可以引用目标资源的同一权威对象"
|
||||
@@ -20855,7 +20852,6 @@ mod tests {
|
||||
Some("object-source"),
|
||||
Some("character"),
|
||||
&different_object_id,
|
||||
None,
|
||||
)
|
||||
.is_err(),
|
||||
"双方都有 assetObjectId 时不能回退相同 objectKey"
|
||||
@@ -20868,7 +20864,6 @@ mod tests {
|
||||
None,
|
||||
Some("character"),
|
||||
&target,
|
||||
None,
|
||||
)
|
||||
.is_ok(),
|
||||
"任一方缺 assetObjectId 时允许 canonical location 回退"
|
||||
@@ -20881,7 +20876,6 @@ mod tests {
|
||||
None,
|
||||
Some("character"),
|
||||
&target,
|
||||
None,
|
||||
)
|
||||
.is_err()
|
||||
);
|
||||
@@ -20893,7 +20887,6 @@ mod tests {
|
||||
Some("object-source"),
|
||||
Some("spec"),
|
||||
&target,
|
||||
None,
|
||||
)
|
||||
.is_err(),
|
||||
"同一对象的来源与目标默认类型冲突时失败关闭"
|
||||
@@ -20917,7 +20910,6 @@ mod tests {
|
||||
Some("object-icon"),
|
||||
Some("icon"),
|
||||
&icon_override_target,
|
||||
None,
|
||||
)
|
||||
.is_ok(),
|
||||
"同媒体族覆盖 {effective_asset_kind} 必须在默认 icon 类型校验之后生效"
|
||||
@@ -20936,7 +20928,6 @@ mod tests {
|
||||
Some("object-source"),
|
||||
Some("character"),
|
||||
&forbidden_override,
|
||||
None,
|
||||
)
|
||||
.is_err(),
|
||||
"目标图层不能为禁止来源借壳"
|
||||
@@ -20951,7 +20942,6 @@ mod tests {
|
||||
Some("object-source"),
|
||||
Some("character"),
|
||||
&video_target,
|
||||
None,
|
||||
)
|
||||
.is_err()
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user