test: Token Claim Airdrop with receiverSigReq test (#15279)

Signed-off-by: ibankov <[email protected]>
hashgraph · Sep 5, 2024 · 1dd9779 · 1dd9779
1 parent b03f5e6
commit 1dd9779
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 16 deletions.
diff --git a/...de/test-clients/src/main/java/com/hedera/services/bdd/suites/hip904/TokenAirdropTest.java b/...de/test-clients/src/main/java/com/hedera/services/bdd/suites/hip904/TokenAirdropTest.java
@@ -1603,14 +1603,10 @@ final Stream<DynamicTest> transferInvalidFungibleToken() {
             return hapiTest(
                     cryptoCreate(ALICE).balance(ONE_HUNDRED_HBARS),
                     cryptoCreate(BOB).balance(ONE_HUNDRED_HBARS),
-                    withOpContext((spec, opLog) -> {
-                        spec.registry()
-                                .saveTokenId(
-                                        FUNGIBLE_TOKEN_A,
-                                        TokenID.newBuilder()
-                                                .setTokenNum(5555555L)
-                                                .build());
-                    }),
+                    withOpContext((spec, opLog) -> spec.registry()
+                            .saveTokenId(
+                                    FUNGIBLE_TOKEN_A,
+                                    TokenID.newBuilder().setTokenNum(5555555L).build())),
                     tokenAirdrop(moving(50L, FUNGIBLE_TOKEN_A).between(ALICE, BOB))
                             .signedByPayerAnd(ALICE)
                             .hasKnownStatus(INVALID_TOKEN_ID));
@@ -1635,14 +1631,10 @@ final Stream<DynamicTest> transferInvalidNFT() {
                             .name(NON_FUNGIBLE_TOKEN_A)
                             .supplyKey(nftKey),
                     tokenAssociate(ALICE, NON_FUNGIBLE_TOKEN_A),
-                    withOpContext((spec, opLog) -> {
-                        spec.registry()
-                                .saveTokenId(
-                                        NON_FUNGIBLE_TOKEN_A,
-                                        TokenID.newBuilder()
-                                                .setTokenNum(5555555L)
-                                                .build());
-                    }),
+                    withOpContext((spec, opLog) -> spec.registry()
+                            .saveTokenId(
+                                    NON_FUNGIBLE_TOKEN_A,
+                                    TokenID.newBuilder().setTokenNum(5555555L).build())),
                     tokenAirdrop(TokenMovement.movingUnique(NON_FUNGIBLE_TOKEN_A, 1L)
                                     .between(ALICE, BOB))
                             .signedByPayerAnd(ALICE)

diff --git a/...st-clients/src/main/java/com/hedera/services/bdd/suites/hip904/TokenClaimAirdropTest.java b/...st-clients/src/main/java/com/hedera/services/bdd/suites/hip904/TokenClaimAirdropTest.java
@@ -729,6 +729,34 @@ final Stream<DynamicTest> claimTokenAirdropSenderAccountPays() {
                 getAccountBalance(RECEIVER).hasTokenBalance(FUNGIBLE_TOKEN, 1)));
     }
 
+    @HapiTest
+    @DisplayName("both associated and not associated FTs and receiver sig required")
+    final Stream<DynamicTest> withTwoTokensAndReceiverSigReq() {
+        final String ALICE = "ALICE";
+        final String BOB = "BOB";
+        return hapiTest(flattened(
+                cryptoCreate(ALICE).balance(ONE_HUNDRED_HBARS),
+                cryptoCreate(BOB)
+                        .balance(ONE_HUNDRED_HBARS)
+                        .maxAutomaticTokenAssociations(0)
+                        .receiverSigRequired(true),
+                createFT(FUNGIBLE_TOKEN_1, ALICE, 1000L),
+                createFT(FUNGIBLE_TOKEN_2, ALICE, 1000L),
+                tokenAssociate(BOB, FUNGIBLE_TOKEN_1),
+                tokenAirdrop(
+                                moving(10, FUNGIBLE_TOKEN_1).between(ALICE, BOB),
+                                moving(10, FUNGIBLE_TOKEN_2).between(ALICE, BOB))
+                        .payingWith(ALICE),
+                getAccountBalance(BOB).hasTokenBalance(FUNGIBLE_TOKEN_1, 0),
+                getAccountBalance(BOB).hasTokenBalance(FUNGIBLE_TOKEN_2, 0),
+                tokenClaimAirdrop(
+                                pendingAirdrop(ALICE, BOB, FUNGIBLE_TOKEN_1),
+                                pendingAirdrop(ALICE, BOB, FUNGIBLE_TOKEN_2))
+                        .payingWith(BOB),
+                getAccountBalance(BOB).hasTokenBalance(FUNGIBLE_TOKEN_1, 10),
+                getAccountBalance(BOB).hasTokenBalance(FUNGIBLE_TOKEN_2, 10)));
+    }
+
     @HapiTest
     @DisplayName("multiple FT airdrops to same receiver")
     final Stream<DynamicTest> multipleFtAirdropsSameReceiver() {