From 0203ede5db3e3cba8ae71fb5af40983e66fa891a Mon Sep 17 00:00:00 2001 From: Lev Povolotsky <16233475+povolev15@users.noreply.github.com> Date: Tue, 28 Nov 2023 08:00:34 -0500 Subject: [PATCH] add additional 2 tests to ScheduleCreateSpecs (#10129) Signed-off-by: Lev Povolotsky --- .../schedule/impl/handlers/ScheduleCreateHandler.java | 10 +++++++++- .../bdd/suites/schedule/ScheduleCreateSpecs.java | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java index 3d0f2217ad45..8a915abec1c7 100644 --- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java +++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleCreateHandler.java @@ -192,7 +192,15 @@ private boolean isPresentIn( for (final Schedule candidate : possibleDuplicates) { if (compareForDuplicates(candidate, provisionalSchedule)) { // Do not forget to set the ID of the existing duplicate in the receipt... - context.recordBuilder(ScheduleRecordBuilder.class).scheduleID(candidate.scheduleId()); + TransactionID scheduledTransactionID = candidate + .originalCreateTransaction() + .transactionID() + .copyBuilder() + .scheduled(true) + .build(); + context.recordBuilder(ScheduleRecordBuilder.class) + .scheduleID(candidate.scheduleId()) + .scheduledTransactionID(scheduledTransactionID); return true; } } diff --git a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleCreateSpecs.java b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleCreateSpecs.java index 97e6165deee3..e178ae43f817 100644 --- a/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleCreateSpecs.java +++ b/hedera-node/test-clients/src/main/java/com/hedera/services/bdd/suites/schedule/ScheduleCreateSpecs.java @@ -337,6 +337,7 @@ private HapiSpec notIdenticalScheduleIfAdminKeyChanges() { .payingWith(FIRST_PAYER)); } + @HapiTest private HapiSpec recognizesIdenticalScheduleEvenWithDifferentDesignatedPayer() { return defaultHapiSpec("recognizesIdenticalScheduleEvenWithDifferentDesignatedPayer") .given( @@ -556,7 +557,7 @@ public HapiSpec rejectsFunctionlessTxn() { .payingWith(GENESIS)); } - // Disabled because schedule throttle is not implemented yet + @HapiTest public HapiSpec functionlessTxnBusyWithNonExemptPayer() { return defaultHapiSpec("FunctionlessTxnBusyWithNonExemptPayer") .given()