From 51fdb807e48a621a79ad353947e404fd08fef823 Mon Sep 17 00:00:00 2001 From: sdimitrov9 Date: Mon, 9 Dec 2024 13:01:31 +0200 Subject: [PATCH] Fix code smells Signed-off-by: sdimitrov9 --- .../domain/transaction/RecordItemTest.java | 5 +- .../graphql/config/LoggingFilterTest.java | 2 +- .../mirror/graphql/util/GraphQlUtilsTest.java | 2 +- hedera-mirror-grpc/Dockerfile | 2 +- .../AbstractSharedTopicListenerTest.java | 3 +- .../TopicMessageRepositoryTest.java | 6 - .../PollingTopicMessageRetrieverTest.java | 3 +- .../importer/PubSubIntegrationTest.java | 3 +- .../AddressBookServiceImplTest.java | 4 +- ...tractResultServiceImplIntegrationTest.java | 2 +- .../importer/domain/StreamFilenameTest.java | 3 +- .../downloader/AbstractDownloaderTest.java | 4 +- .../CommonDownloaderPropertiesTest.java | 4 +- .../record/ProtoRecordFileDownloaderTest.java | 4 +- .../migration/BlockNumberMigrationTest.java | 6 +- ...icCryptoTransferApprovalMigrationTest.java | 7 +- ...dateTokenFreezeKycStatusMigrationTest.java | 4 +- .../TransactionHashBatchInserterTest.java | 4 +- .../batch/TransactionHashTxManagerTest.java | 2 +- .../EntityRecordItemListenerContractTest.java | 2 +- .../EntityRecordItemListenerCryptoTest.java | 2 +- .../EntityRecordItemListenerFileTest.java | 10 +- .../EntityRecordItemListenerTokenTest.java | 4 +- .../entity/TransactionSignatureTest.java | 3 +- .../entity/redis/RedisPublisherTest.java | 2 +- .../record/pubsub/PubSubRecordParserTest.java | 3 +- .../AbstractTransactionHandlerTest.java | 2 +- .../balance/ProtoBalanceFileReaderTest.java | 5 +- .../line/AccountBalanceLineParserV1Test.java | 10 +- .../record/AbstractRecordFileReaderTest.java | 4 +- .../record/RecordFileReaderImplV5Test.java | 4 +- .../reader/record/RecordFileReaderTest.java | 22 +- .../signature/SignatureFileReaderV2Test.java | 9 +- .../repository/EntityRepositoryTest.java | 2 +- .../monitor/config/LoggingFilterTest.java | 2 +- .../health/ReleaseHealthIndicatorTest.java | 3 +- .../ConfigurableTransactionGeneratorTest.java | 2 +- .../subscribe/SubscribeMetricsTest.java | 5 +- .../restjava/controller/ControllerTest.java | 2 +- .../repository/EntityRepositoryTest.java | 8 +- .../e2e/acceptance/client/FileClient.java | 2 +- .../acceptance/client/MirrorNodeClient.java | 2 +- .../e2e/acceptance/client/ScheduleClient.java | 2 +- .../e2e/acceptance/client/StartupProbe.java | 2 +- .../acceptance/steps/ERCContractFeature.java | 3 +- .../steps/EstimatePrecompileFeature.java | 4 +- .../acceptance/steps/HistoricalFeature.java | 13 +- .../steps/PrecompileContractFeature.java | 3 +- .../test/e2e/acceptance/util/TestUtil.java | 2 +- .../evm/store/RWCachingStateFrameTest.java | 16 +- .../contract/EntityAddressSequencerTest.java | 10 +- ...HederaEvmStackedWorldStateUpdaterTest.java | 32 +-- .../contract/MirrorEntityAccessTest.java | 1 - .../AccountBalanceRepositoryTest.java | 5 +- .../CryptoAllowanceRepositoryTest.java | 27 +- .../TokenAccountRepositoryTest.java | 41 ++- .../TokenAllowanceRepositoryTest.java | 69 +++-- .../execution/LivePricesSourceTest.java | 32 +-- .../fees/BasicHbarCentExchangeTest.java | 18 +- .../fees/calc/OverflowCheckingCalcTest.java | 110 ++++---- .../UsageBasedFeeCalculatorTest.java | 4 +- .../fees/usage/TxnUsageEstimatorTest.java | 2 +- .../state/submerkle/RichInstantTest.java | 26 +- .../precompile/AssociatePrecompileTest.java | 4 +- .../precompile/DeleteTokenPrecompileTest.java | 4 +- .../precompile/DissociatePrecompileTest.java | 4 +- .../precompile/FungibleTokenTransferTest.java | 14 +- .../contracts/precompile/HTSTestsUtil.java | 45 ++-- .../precompile/HbarTransferTest.java | 12 +- .../precompile/MintPrecompileTest.java | 4 +- .../contracts/precompile/NftExchangeTest.java | 12 +- .../precompile/PausePrecompileTest.java | 2 +- .../precompile/SyntheticTxnFactoryTest.java | 236 +++++++++--------- .../TokenUpdateKeysPrecompileTest.java | 4 +- .../precompile/TransferPrecompileTest.java | 2 +- .../precompile/UnpausePrecompileTest.java | 2 +- .../WipeFungiblePrecompileTest.java | 4 +- .../WipeNonFungiblePrecompileTest.java | 3 - .../services/txn/token/BurnLogicTest.java | 7 - .../accessors/SignedTxnAccessorTest.java | 42 ---- 80 files changed, 478 insertions(+), 525 deletions(-) diff --git a/hedera-mirror-common/src/test/java/com/hedera/mirror/common/domain/transaction/RecordItemTest.java b/hedera-mirror-common/src/test/java/com/hedera/mirror/common/domain/transaction/RecordItemTest.java index 2a919b55059..7f928a903b3 100644 --- a/hedera-mirror-common/src/test/java/com/hedera/mirror/common/domain/transaction/RecordItemTest.java +++ b/hedera-mirror-common/src/test/java/com/hedera/mirror/common/domain/transaction/RecordItemTest.java @@ -614,7 +614,7 @@ void testAddContractTransaction() { var recordItem = RecordItem.builder() .payerAccountId(EntityId.of(payerAccountId)) .transaction(transaction) - .contractTransactionPredicate((entityId) -> true) + .contractTransactionPredicate(entityId -> true) .transactionRecord(transactionRecord) .build(); var account = EntityId.of(id++); @@ -652,7 +652,6 @@ void testAddContractTransactionDisabled() { long id = random.nextLong(2000) + 2000L; var now = Instant.now(); var payerAccountId = AccountID.newBuilder().setAccountNum(id++).build(); - long consensusTimestamp = now.getEpochSecond() * 1_000_000_000 + now.getNano(); var validStart = Timestamp.newBuilder().setSeconds(now.getEpochSecond() - 1).setNanos(now.getNano()); var transactionBody = TransactionBody.newBuilder() @@ -675,7 +674,7 @@ void testAddContractTransactionDisabled() { var recordItem = RecordItem.builder() .payerAccountId(EntityId.of(payerAccountId)) .transaction(transaction) - .contractTransactionPredicate((entityId) -> false) + .contractTransactionPredicate(entityId -> false) .transactionRecord(transactionRecord) .build(); diff --git a/hedera-mirror-graphql/src/test/java/com/hedera/mirror/graphql/config/LoggingFilterTest.java b/hedera-mirror-graphql/src/test/java/com/hedera/mirror/graphql/config/LoggingFilterTest.java index b812fdbd0b0..f9446f8b02d 100644 --- a/hedera-mirror-graphql/src/test/java/com/hedera/mirror/graphql/config/LoggingFilterTest.java +++ b/hedera-mirror-graphql/src/test/java/com/hedera/mirror/graphql/config/LoggingFilterTest.java @@ -120,7 +120,7 @@ void filterOnError(CapturedOutput output) { var exception = new IllegalArgumentException("error"); StepVerifier.withVirtualTime(() -> loggingFilter .filter(exchange, serverWebExchange -> Mono.error(exception)) - .onErrorResume((t) -> exchange.getResponse().setComplete())) + .onErrorResume(t -> exchange.getResponse().setComplete())) .thenAwait(WAIT) .expectComplete() .verify(WAIT); diff --git a/hedera-mirror-graphql/src/test/java/com/hedera/mirror/graphql/util/GraphQlUtilsTest.java b/hedera-mirror-graphql/src/test/java/com/hedera/mirror/graphql/util/GraphQlUtilsTest.java index 15cba3bb9ef..5855fc8cce4 100644 --- a/hedera-mirror-graphql/src/test/java/com/hedera/mirror/graphql/util/GraphQlUtilsTest.java +++ b/hedera-mirror-graphql/src/test/java/com/hedera/mirror/graphql/util/GraphQlUtilsTest.java @@ -83,7 +83,7 @@ void toEntityId() { @Test void validateOneOf() { GraphQlUtils.validateOneOf("a"); - assertThatThrownBy(() -> GraphQlUtils.validateOneOf()).isInstanceOf(IllegalArgumentException.class); + assertThatThrownBy(GraphQlUtils::validateOneOf).isInstanceOf(IllegalArgumentException.class); assertThatThrownBy(() -> GraphQlUtils.validateOneOf("a", "b")).isInstanceOf(IllegalArgumentException.class); } diff --git a/hedera-mirror-grpc/Dockerfile b/hedera-mirror-grpc/Dockerfile index b984ea407c6..74a865f7278 100644 --- a/hedera-mirror-grpc/Dockerfile +++ b/hedera-mirror-grpc/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:21-jre-noble as builder +FROM eclipse-temurin:21-jre-noble AS builder WORKDIR /app COPY build/libs/*.jar ./ RUN java -Djarmode=layertools -jar *.jar extract diff --git a/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/listener/AbstractSharedTopicListenerTest.java b/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/listener/AbstractSharedTopicListenerTest.java index 2f6823b94bb..2187a5ce6c6 100644 --- a/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/listener/AbstractSharedTopicListenerTest.java +++ b/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/listener/AbstractSharedTopicListenerTest.java @@ -21,7 +21,6 @@ import com.hedera.mirror.common.domain.topic.TopicMessage; import com.hedera.mirror.grpc.domain.TopicMessageFilter; import java.time.Duration; -import java.util.stream.Collectors; import java.util.stream.LongStream; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -53,7 +52,7 @@ void slowSubscriberOverflowException() { .listen(filterFast) .map(TopicMessage::getSequenceNumber) .as(StepVerifier::create) - .expectNextSequence(LongStream.range(1, numMessages + 1).boxed().collect(Collectors.toList())) + .expectNextSequence(LongStream.range(1, numMessages + 1).boxed().toList()) .thenCancel() .verifyLater(); diff --git a/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/repository/TopicMessageRepositoryTest.java b/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/repository/TopicMessageRepositoryTest.java index 25946095426..8f9f7e4acce 100644 --- a/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/repository/TopicMessageRepositoryTest.java +++ b/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/repository/TopicMessageRepositoryTest.java @@ -48,8 +48,6 @@ void findByFilterEmpty() { @Test void findByFilterNoMatch() { TopicMessage topicMessage1 = domainBuilder.topicMessage().block(); - TopicMessage topicMessage2 = domainBuilder.topicMessage().block(); - TopicMessage topicMessage3 = domainBuilder.topicMessage().block(); TopicMessageFilter filter = TopicMessageFilter.builder() .startTime(DomainUtils.convertToNanosMax(Instant.now().plusSeconds(10))) @@ -65,8 +63,6 @@ void findByFilterWithTopicId() { domainBuilder.topicMessage(t -> t.topicId(EntityId.of(1))).block(); TopicMessage topicMessage2 = domainBuilder.topicMessage(t -> t.topicId(EntityId.of(2))).block(); - TopicMessage topicMessage3 = - domainBuilder.topicMessage(t -> t.topicId(EntityId.of(3))).block(); TopicMessageFilter filter = TopicMessageFilter.builder() .topicId(EntityId.of(2L)) @@ -108,8 +104,6 @@ void findByFilterWithEndTime() { @Test void findByFilterWithLimit() { TopicMessage topicMessage1 = domainBuilder.topicMessage().block(); - TopicMessage topicMessage2 = domainBuilder.topicMessage().block(); - TopicMessage topicMessage3 = domainBuilder.topicMessage().block(); TopicMessageFilter filter = TopicMessageFilter.builder() .limit(1) diff --git a/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/retriever/PollingTopicMessageRetrieverTest.java b/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/retriever/PollingTopicMessageRetrieverTest.java index e14c2bf70ac..ffcdac3d570 100644 --- a/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/retriever/PollingTopicMessageRetrieverTest.java +++ b/hedera-mirror-grpc/src/test/java/com/hedera/mirror/grpc/retriever/PollingTopicMessageRetrieverTest.java @@ -23,7 +23,6 @@ import com.hedera.mirror.grpc.domain.ReactiveDomainBuilder; import com.hedera.mirror.grpc.domain.TopicMessageFilter; import java.time.Duration; -import java.util.stream.Collectors; import java.util.stream.LongStream; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; @@ -278,7 +277,7 @@ void unthrottledShouldKeepPolling() { .then(firstBatch::blockLast) .then(secondBatch::blockLast) .thenAwait(WAIT) - .expectNextSequence(LongStream.range(1, 11).boxed().collect(Collectors.toList())) + .expectNextSequence(LongStream.range(1, 11).boxed().toList()) .expectComplete() .verify(WAIT); } diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/PubSubIntegrationTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/PubSubIntegrationTest.java index 58215da1b4e..f61f057dedc 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/PubSubIntegrationTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/PubSubIntegrationTest.java @@ -26,7 +26,6 @@ import com.hedera.mirror.importer.parser.record.pubsub.PubSubProperties; import jakarta.annotation.Resource; import java.util.List; -import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeEach; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.TestConfiguration; @@ -76,7 +75,7 @@ protected List getAllMessages(int numMessages) { m.ack(); return m.getPubsubMessage(); }) - .collect(Collectors.toList()); + .toList(); } @TestConfiguration diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/addressbook/AddressBookServiceImplTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/addressbook/AddressBookServiceImplTest.java index f5db6af5135..279b21c1963 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/addressbook/AddressBookServiceImplTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/addressbook/AddressBookServiceImplTest.java @@ -178,9 +178,7 @@ void startupWithOtherNetworkIncorrectInitialAddressBookPath() { otherNetworkImporterProperties, nodeStakeRepository, transactionTemplate); - assertThrows(IllegalStateException.class, () -> { - customAddressBookService.getCurrent(); - }); + assertThrows(IllegalStateException.class, customAddressBookService::getCurrent); assertEquals(0, addressBookRepository.count()); } diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/domain/ContractResultServiceImplIntegrationTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/domain/ContractResultServiceImplIntegrationTest.java index c3e649218fe..1cce5392901 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/domain/ContractResultServiceImplIntegrationTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/domain/ContractResultServiceImplIntegrationTest.java @@ -738,7 +738,7 @@ private void assertContractResult(RecordItem recordItem) { var functionResult = getFunctionResult(recordItem); var createdIds = functionResult.getCreatedContractIDsList().stream() .map(x -> EntityId.of(x).getId()) - .collect(Collectors.toList()); + .toList(); var failedInitcode = getFailedInitcode(recordItem); var hash = getTransactionHash(recordItem); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/domain/StreamFilenameTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/domain/StreamFilenameTest.java index 2d2f7bf0240..d1b772de5ac 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/domain/StreamFilenameTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/domain/StreamFilenameTest.java @@ -26,7 +26,6 @@ import java.time.Instant; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; @@ -113,7 +112,7 @@ void getFilename(StreamType streamType, StreamFilename.FileType fileType, Instan Set extensions = fileType == DATA ? streamType.getDataExtensions() : streamType.getSignatureExtensions(); List names = - extensions.stream().map(StreamType.Extension::getName).collect(Collectors.toList()); + extensions.stream().map(StreamType.Extension::getName).toList(); assertThat(filename).startsWith(expectedPrefix); assertThat(extension).isIn(names); } diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/AbstractDownloaderTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/AbstractDownloaderTest.java index 306836ed94c..6c919a1a530 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/AbstractDownloaderTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/AbstractDownloaderTest.java @@ -520,7 +520,7 @@ void startDate(long seconds, String fileChoice) { List expectedFiles = instantFilenamePairs.stream() .filter(pair -> pair.getLeft().isAfter(startDate)) .map(Pair::getRight) - .collect(Collectors.toList()); + .toList(); fileCopier.copy(); downloader.download(); @@ -542,7 +542,7 @@ void endDate(long seconds, String fileChoice) { List expectedFiles = instantFilenamePairs.stream() .filter(pair -> !pair.getLeft().isAfter(importerProperties.getEndDate())) .map(Pair::getRight) - .collect(Collectors.toList()); + .toList(); expectLastStreamFile(Instant.EPOCH); fileCopier.copy(); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/CommonDownloaderPropertiesTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/CommonDownloaderPropertiesTest.java index 1de830e68ea..2b7399dd4f0 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/CommonDownloaderPropertiesTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/CommonDownloaderPropertiesTest.java @@ -47,10 +47,10 @@ void initNoNetworkDefaultBucketName() { var properties = new CommonDownloaderProperties(mirrorProperties); mirrorProperties.setNetwork(HederaNetwork.OTHER); - assertThrows(IllegalArgumentException.class, () -> properties.init()); + assertThrows(IllegalArgumentException.class, properties::init); mirrorProperties.setNetwork("mynetwork"); - assertThrows(IllegalArgumentException.class, () -> properties.init()); + assertThrows(IllegalArgumentException.class, properties::init); } @Test diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/record/ProtoRecordFileDownloaderTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/record/ProtoRecordFileDownloaderTest.java index 7c1959c9df8..826d99bc79a 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/record/ProtoRecordFileDownloaderTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/downloader/record/ProtoRecordFileDownloaderTest.java @@ -93,7 +93,7 @@ void sidecarTypesFilter() { super.verifyStreamFiles(List.of(file1, file2), actual -> { var transactionSidecarRecords = actual.getItems().stream() .flatMap(r -> r.getSidecarRecords().stream()) - .collect(Collectors.toList()); + .toList(); assertThat(transactionSidecarRecords).isEmpty(); }); assertThat(importerProperties.getDataPath()).isEmptyDirectory(); @@ -111,7 +111,7 @@ void sidecarTypesFilterSome() { var sidecarTypes = recordFile.getItems().stream() .flatMap(r -> r.getSidecarRecords().stream()) .map(TransactionSidecarRecord::getSidecarRecordsCase) - .collect(Collectors.toList()); + .toList(); if (Objects.equals(recordFile.getName(), RECORD_FILE_WITH_SIDECAR)) { assertThat(sidecarTypes).containsExactly(TransactionSidecarRecord.SidecarRecordsCase.BYTECODE); } else { diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/BlockNumberMigrationTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/BlockNumberMigrationTest.java index f5e43322518..845092556b0 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/BlockNumberMigrationTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/BlockNumberMigrationTest.java @@ -65,7 +65,7 @@ void unsupportedNetwork() { List expectedBlockNumbersAndConsensusEnd = insertDefaultRecordFiles(Set.of(CORRECT_CONSENSUS_END)).stream() .map(recordFile -> Tuple.tuple(recordFile.getConsensusEnd(), recordFile.getIndex())) - .collect(Collectors.toList()); + .toList(); blockNumberMigration.doMigrate(); @@ -79,7 +79,7 @@ void theCorrectOffsetMustBeAddedToTheBlockNumbers() { long offset = CORRECT_BLOCK_NUMBER - 8L; List expectedBlockNumbersAndConsensusEnd = defaultRecordFiles.stream() .map(recordFile -> Tuple.tuple(recordFile.getConsensusEnd(), recordFile.getIndex() + offset)) - .collect(Collectors.toList()); + .toList(); blockNumberMigration.doMigrate(); @@ -91,7 +91,7 @@ void ifCorrectConsensusEndNotFoundDoNothing() { List expectedBlockNumbersAndConsensusEnd = insertDefaultRecordFiles(Set.of(CORRECT_CONSENSUS_END)).stream() .map(recordFile -> Tuple.tuple(recordFile.getConsensusEnd(), recordFile.getIndex())) - .collect(Collectors.toList()); + .toList(); blockNumberMigration.doMigrate(); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/SyntheticCryptoTransferApprovalMigrationTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/SyntheticCryptoTransferApprovalMigrationTest.java index f60b3f64cd1..67146ba9338 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/SyntheticCryptoTransferApprovalMigrationTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/SyntheticCryptoTransferApprovalMigrationTest.java @@ -47,7 +47,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Collectors; import java.util.stream.Stream; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.AfterEach; @@ -273,13 +272,13 @@ void onEndHapiVersionNotMatched() { .containsExactlyInAnyOrderElementsOf( Stream.of(cryptoTransfersPair.getLeft(), cryptoTransfersPair.getRight()) .flatMap(Collection::stream) - .collect(Collectors.toList())); + .toList()); assertThat(tokenTransferRepository.findAll()) .containsExactlyInAnyOrderElementsOf( Stream.of(tokenTransfersPair.getLeft(), tokenTransfersPair.getRight()) .flatMap(Collection::stream) - .collect(Collectors.toList())); + .toList()); var repositoryNftTransfers = new ArrayList(); transactionRepository.findAll().forEach(t -> repositoryNftTransfers.addAll(t.getNftTransfer())); @@ -287,7 +286,7 @@ void onEndHapiVersionNotMatched() { .containsExactlyInAnyOrderElementsOf( Stream.of(nftTransfersTransactionPair.getLeft(), nftTransfersTransactionPair.getRight()) .flatMap(Collection::stream) - .collect(Collectors.toList())); + .toList()); } private void assertTransfers( diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/UpdateTokenFreezeKycStatusMigrationTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/UpdateTokenFreezeKycStatusMigrationTest.java index 43c4ee23b91..5f5f932dc98 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/UpdateTokenFreezeKycStatusMigrationTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/migration/UpdateTokenFreezeKycStatusMigrationTest.java @@ -137,9 +137,9 @@ void migrate() { // add current tokens, and the expected current tokens tokens.forEach( - (t) -> t.timestampRange = Range.atLeast(t.getTimestampRange().upperEndpoint())); + t -> t.timestampRange = Range.atLeast(t.getTimestampRange().upperEndpoint())); var expectedCurrent = expectedHistory.stream() - .map((t) -> t.toBuilder() + .map(t -> t.toBuilder() .timestampRange(Range.atLeast(t.getTimestampRange().upperEndpoint())) .build()) .toList(); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/batch/TransactionHashBatchInserterTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/batch/TransactionHashBatchInserterTest.java index 1917b2ba0ce..ac0d260968f 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/batch/TransactionHashBatchInserterTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/batch/TransactionHashBatchInserterTest.java @@ -314,11 +314,11 @@ void persistTransactionHashInvalid(byte[] bytes) { }); shardMap.forEach((shard, items) -> assertThat(TestUtils.getShardTransactionHashes(shard, jdbcTemplate)) - .isEqualTo(items.stream().filter(TransactionHash::hashIsValid).collect(Collectors.toList()))); + .isEqualTo(items.stream().filter(TransactionHash::hashIsValid).toList())); assertThat(transactionHashRepository.findAll()) .containsExactlyInAnyOrderElementsOf(transactionHashes.stream() .filter(TransactionHash::hashIsValid) - .collect(Collectors.toList())); + .toList()); } @SneakyThrows diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/batch/TransactionHashTxManagerTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/batch/TransactionHashTxManagerTest.java index 366dd04fcfa..25e4fa688dc 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/batch/TransactionHashTxManagerTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/batch/TransactionHashTxManagerTest.java @@ -90,7 +90,7 @@ void testThreadCommit() { TestUtils.insertIntoTransactionHash(jdbcTemplate, hash4); }); - transactionTemplate.executeWithoutResult((status) -> { + transactionTemplate.executeWithoutResult(status -> { try { transactionHashTxManager.initialize(Collections.singleton(hash1), "transaction_hash"); assertThat(transactionHashTxManager.getItemCount()).isEqualTo(1); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerContractTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerContractTest.java index 3617f73e9ea..c062ad52165 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerContractTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerContractTest.java @@ -1342,7 +1342,7 @@ private void assertContractResult( ObjectAssert contractResult) { List createdContractIds = result.getCreatedContractIDsList().stream() .map(ContractID::getContractNum) - .collect(Collectors.toList()); + .toList(); contractResult .returns(result.getBloom().toByteArray(), ContractResult::getBloom) diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerCryptoTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerCryptoTest.java index 75ff0486e41..3008b58576b 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerCryptoTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerCryptoTest.java @@ -1399,7 +1399,7 @@ void cryptoTransferUpdatesAllowanceAmount() { TransactionBody transactionBody = getTransactionBody(transaction); var recordCryptoTransfers = cryptoTransfers.stream() .map(transfer -> transfer.toBuilder().setIsApproval(false).build()) - .collect(Collectors.toList()); + .toList(); TransactionRecord record = buildTransactionRecordWithNoTransactions( builder -> builder.getTransferListBuilder().addAllAccountAmounts(recordCryptoTransfers), transactionBody, diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerFileTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerFileTest.java index 8fb908fe9a9..25156f7bed6 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerFileTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerFileTest.java @@ -252,7 +252,7 @@ void fileUpdateAllToExisting() { .build()); assertAll( - () -> assertRowCountOnTwoFileTransactions(), + this::assertRowCountOnTwoFileTransactions, () -> assertTransactionAndRecord(transactionBody, record), () -> assertFileEntityAndData(transactionBody.getFileUpdate(), record.getConsensusTimestamp())); } @@ -329,7 +329,7 @@ void fileAppendToAddressBook() throws IOException { () -> assertArrayEquals(addressBook, newAddressBook.getFileData())); assertAll( - () -> assertRowCountOnAddressBookTransactions(), + this::assertRowCountOnAddressBookTransactions, () -> assertTransactionAndRecord(transactionBodyUpdate, recordUpdate), () -> assertTransactionAndRecord(transactionBodyAppend, recordAppend), () -> assertFileData(fileAppendTransactionBody.getContents(), recordAppend.getConsensusTimestamp()), @@ -446,7 +446,7 @@ void fileUpdateContentsToExisting() { Entity actualFile = getTransactionEntity(record.getConsensusTimestamp()); assertAll( - () -> assertRowCountOnTwoFileTransactions(), + this::assertRowCountOnTwoFileTransactions, () -> assertTransactionAndRecord(transactionBody, record), () -> assertFileData(transactionBody.getFileUpdate().getContents(), record.getConsensusTimestamp()), // Additional entity checks @@ -507,7 +507,7 @@ void fileUpdateExpiryToExisting() { assertAll( // TODO: Review row count of fileDataRepository with issue #294, probably should be 1 - () -> assertRowCountOnTwoFileTransactions(), + this::assertRowCountOnTwoFileTransactions, () -> assertTransactionAndRecord(transactionBody, record), // Additional entity checks () -> assertFalse(actualFile.getDeleted()), @@ -575,7 +575,7 @@ void fileUpdateKeysToExisting() { assertAll( // TODO: Review row count of fileDataRepository with issue #294, probably should be 1 - () -> assertRowCountOnTwoFileTransactions(), + this::assertRowCountOnTwoFileTransactions, () -> assertTransactionAndRecord(transactionBody, record), // Additional entity checks () -> assertFalse(dbFileEntity.getDeleted()), diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerTokenTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerTokenTest.java index 4d9af7aa2fa..3642f063174 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerTokenTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/EntityRecordItemListenerTokenTest.java @@ -462,7 +462,7 @@ void tokenCreateWithAutoTokenAssociations( List expectedTokenAccounts) { List autoAssociatedAccounts = expectedTokenAccounts.stream() .map(t -> EntityId.of(t.getAccountId())) - .collect(Collectors.toList()); + .toList(); tokenCreate( customFees, freezeDefault, @@ -541,7 +541,7 @@ void tokenCreateWithNfts( CREATE_TIMESTAMP); var autoAssociatedAccounts = expectedTokenAccounts.stream() .map(t -> EntityId.of(t.getAccountId())) - .collect(Collectors.toList()); + .toList(); // when createTokenEntity( diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/TransactionSignatureTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/TransactionSignatureTest.java index eb55fa7f30c..361367120b4 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/TransactionSignatureTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/TransactionSignatureTest.java @@ -55,7 +55,6 @@ import java.util.EnumSet; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.extension.ExtendWith; @@ -138,7 +137,7 @@ void setup() { transactionSignature.setType(SignaturePair.SignatureCase.ED25519.getNumber()); return transactionSignature; }) - .collect(Collectors.toList()); + .toList(); transactionSignatures = entityProperties.getPersist().getTransactionSignatures(); doReturn(ENTITY_ID).when(transactionHandler).getEntity(any(RecordItem.class)); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/redis/RedisPublisherTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/redis/RedisPublisherTest.java index e6c2fcdc902..897d8ebd2ae 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/redis/RedisPublisherTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/entity/redis/RedisPublisherTest.java @@ -70,7 +70,7 @@ void onSlowPublish() { }); // when - when(redisOperations.executePipelined(any(SessionCallback.class))).then((callback) -> { + when(redisOperations.executePipelined(any(SessionCallback.class))).then(callback -> { Uninterruptibles.sleepUninterruptibly(Duration.ofMillis(50L)); sink.tryEmitNext(callback); return null; diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/pubsub/PubSubRecordParserTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/pubsub/PubSubRecordParserTest.java index 8921168316b..27f1ca0658c 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/pubsub/PubSubRecordParserTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/pubsub/PubSubRecordParserTest.java @@ -34,7 +34,6 @@ import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.awaitility.Durations; import org.junit.jupiter.api.Test; @@ -79,7 +78,7 @@ void testPubSubExporter() throws Exception { List actualMessages = subscriberMessages.stream() .map(PubsubMessage::getData) .map(ByteString::toStringUtf8) - .collect(Collectors.toList()); + .toList(); // map timestamps to messages and compare individual message JSON strings Map expectedMessageMap = mapMessages(expectedMessages); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/transactionhandler/AbstractTransactionHandlerTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/transactionhandler/AbstractTransactionHandlerTest.java index 3735a4433be..6d9c706bc26 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/transactionhandler/AbstractTransactionHandlerTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/parser/record/transactionhandler/AbstractTransactionHandlerTest.java @@ -265,7 +265,7 @@ Stream testUpdateEntity() { testSpecs = getUpdateEntityTestSpecs(); } - return DynamicTest.stream(testSpecs.iterator(), UpdateEntityTestSpec::getDescription, (testSpec) -> { + return DynamicTest.stream(testSpecs.iterator(), UpdateEntityTestSpec::getDescription, testSpec -> { // when var transaction = new com.hedera.mirror.common.domain.transaction.Transaction(); transaction.setEntityId(testSpec.getExpected().toEntityId()); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/balance/ProtoBalanceFileReaderTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/balance/ProtoBalanceFileReaderTest.java index ee1314bec40..370e9f77583 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/balance/ProtoBalanceFileReaderTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/balance/ProtoBalanceFileReaderTest.java @@ -35,7 +35,6 @@ import java.nio.file.Paths; import java.time.Instant; import java.util.List; -import java.util.stream.Collectors; import java.util.stream.IntStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -152,11 +151,11 @@ private AccountBalanceFile getExpectedAccountBalanceFile(StreamFileData streamFi tokenBalance + i * 5L + j, new TokenBalance.Id(consensusTimestamp, accountId, tokenId)); }) - .collect(Collectors.toList()); + .toList(); return new AccountBalance( hbarBalance + i, tokenBalances, new AccountBalance.Id(consensusTimestamp, accountId)); }) - .collect(Collectors.toList()); + .toList(); return AccountBalanceFile.builder() .bytes(streamFileData.getBytes()) .consensusTimestamp(consensusTimestamp) diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/balance/line/AccountBalanceLineParserV1Test.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/balance/line/AccountBalanceLineParserV1Test.java index 94666f1dc8d..0169a7ea39c 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/balance/line/AccountBalanceLineParserV1Test.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/balance/line/AccountBalanceLineParserV1Test.java @@ -30,7 +30,7 @@ class AccountBalanceLineParserV1Test { - private static final long timestamp = 1596340377922333444L; + private static final long TIMESTAMP = 1596340377922333444L; private AccountBalanceLineParserV1 parser; private ImporterProperties importerProperties; @@ -70,7 +70,7 @@ void setup() { delimiter = ';') void parse(String line, boolean expectThrow, Long expectedRealm, Long expectedAccount, Long expectedBalance) { if (!expectThrow) { - AccountBalance accountBalance = parser.parse(line, timestamp); + AccountBalance accountBalance = parser.parse(line, TIMESTAMP); var id = accountBalance.getId(); assertThat(accountBalance.getBalance()).isEqualTo(expectedBalance); @@ -78,10 +78,10 @@ void parse(String line, boolean expectThrow, Long expectedRealm, Long expectedAc assertThat(id.getAccountId().getShard()).isEqualTo(importerProperties.getShard()); assertThat(id.getAccountId().getRealm()).isEqualTo(expectedRealm); assertThat(id.getAccountId().getNum()).isEqualTo(expectedAccount); - assertThat(id.getConsensusTimestamp()).isEqualTo(timestamp); + assertThat(id.getConsensusTimestamp()).isEqualTo(TIMESTAMP); } else { assertThrows(InvalidDatasetException.class, () -> { - parser.parse(line, timestamp); + parser.parse(line, TIMESTAMP); }); } } @@ -89,7 +89,7 @@ void parse(String line, boolean expectThrow, Long expectedRealm, Long expectedAc @Test void parseNullLine() { assertThrows(InvalidDatasetException.class, () -> { - parser.parse(null, timestamp); + parser.parse(null, TIMESTAMP); }); } } diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/AbstractRecordFileReaderTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/AbstractRecordFileReaderTest.java index 27f4a495a1a..416f49f8f3f 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/AbstractRecordFileReaderTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/AbstractRecordFileReaderTest.java @@ -33,8 +33,8 @@ Stream readIncompatibleFile() { return DynamicTest.stream( getFilteredFiles(true), - (recordFile) -> String.format(template, recordFile.getVersion(), recordFile.getName()), - (recordFile) -> { + recordFile -> String.format(template, recordFile.getVersion(), recordFile.getName()), + recordFile -> { // given Path testFile = getTestFile(recordFile); StreamFileData streamFileData = StreamFileData.from(testFile.toFile()); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/RecordFileReaderImplV5Test.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/RecordFileReaderImplV5Test.java index 5b57777b4b0..78a6adea283 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/RecordFileReaderImplV5Test.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/RecordFileReaderImplV5Test.java @@ -49,8 +49,8 @@ Stream verifyRecordItemLinksInEthTransactionValidFile() { return DynamicTest.stream( Arrays.stream(resourceResolver.getResources( "classpath:data/recordstreams/eth-0.26.0/record0.0.3/*" + ".rcd")), - (recordFile) -> String.format(template, recordFile.getFilename()), - (recordFile) -> { + recordFile -> String.format(template, recordFile.getFilename()), + recordFile -> { // given StreamFileData streamFileData = StreamFileData.from(recordFile.getFile()); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/RecordFileReaderTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/RecordFileReaderTest.java index 9cbd9ef710a..2b18ccda397 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/RecordFileReaderTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/record/RecordFileReaderTest.java @@ -66,8 +66,8 @@ Stream readValidFile() { return DynamicTest.stream( getFilteredFiles(false), - (recordFile) -> String.format(template, recordFile.getVersion(), recordFile.getName()), - (recordFile) -> { + recordFile -> String.format(template, recordFile.getVersion(), recordFile.getName()), + recordFile -> { // given Path testFile = getTestFile(recordFile); StreamFileData streamFileData = StreamFileData.from(testFile.toFile()); @@ -85,7 +85,7 @@ Stream readValidFile() { List hapiVersions = actual.getItems().stream() .map(RecordItem::getHapiVersion) - .collect(Collectors.toList()); + .toList(); assertThat(hapiVersions) .isNotEmpty() .allSatisfy(version -> assertEquals(recordFile.getHapiVersion(), version)); @@ -99,12 +99,12 @@ Stream readValidFile() { List transactionIndexes = actual.getItems().stream() .map(RecordItem::getTransactionIndex) - .collect(Collectors.toList()); + .toList(); assertThat(transactionIndexes).first().isEqualTo(0); assertThat(transactionIndexes) .isEqualTo(IntStream.range(0, recordFile.getCount().intValue()) .boxed() - .collect(Collectors.toList())); + .toList()); assertThat(transactionIndexes).doesNotHaveDuplicates().isSorted(); }); } @@ -116,8 +116,8 @@ Stream verifyRecordItemLinksInValidFile() { return DynamicTest.stream( getFilteredFiles(false), - (recordFile) -> String.format(template, recordFile.getVersion(), recordFile.getName()), - (recordFile) -> { + recordFile -> String.format(template, recordFile.getVersion(), recordFile.getName()), + recordFile -> { // given Path testFile = getTestFile(recordFile); StreamFileData streamFileData = StreamFileData.from(testFile.toFile()); @@ -141,8 +141,8 @@ Stream readInvalidFileWithGarbageAppended() { return DynamicTest.stream( getFilteredFiles(false), - (recordFile) -> String.format(template, recordFile.getVersion(), recordFile.getName()), - (recordFile) -> { + recordFile -> String.format(template, recordFile.getVersion(), recordFile.getName()), + recordFile -> { // given Path testFile = getTestFile(recordFile); byte[] bytes = FileUtils.readFileToByteArray(testFile.toFile()); @@ -160,8 +160,8 @@ Stream readInvalidFileWithDataTruncated() { return DynamicTest.stream( getFilteredFiles(false), - (recordFile) -> String.format(template, recordFile.getVersion(), recordFile.getName()), - (recordFile) -> { + recordFile -> String.format(template, recordFile.getVersion(), recordFile.getName()), + recordFile -> { // given Path testFile = getTestFile(recordFile); byte[] bytes = FileUtils.readFileToByteArray(testFile.toFile()); diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/signature/SignatureFileReaderV2Test.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/signature/SignatureFileReaderV2Test.java index 23fd292d08a..d580a7b6da7 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/signature/SignatureFileReaderV2Test.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/reader/signature/SignatureFileReaderV2Test.java @@ -37,9 +37,9 @@ class SignatureFileReaderV2Test extends AbstractSignatureFileReaderTest { - private static final String entireFileHashBase64 = + private static final String ENTIRE_FILE_HASH_BASE_64 = "WRVY4Fm9FinuOGxONaaHW0xnoJZxj10iV3KmUQQnFRiUFN99tViEle" + "+yqF3EoP/a"; - private static final String entireFileSignatureBase64 = "nOVITUEb1WfYLJN4Jp2/aIEYTiqEzfTSMU5Y6KDKbCi55" + private static final String ENTIRE_FILE_SIGNATURE_BASE_64 = "nOVITUEb1WfYLJN4Jp2/aIEYTiqEzfTSMU5Y6KDKbCi55" + "+vsWasqfQaUE4JLGC+JO+Ky2Ui1WsnDHCDxxE/Jx0K+90n2eg8pFZLlA6xcMZ4fLchy6+mhQWYhtRSdCr6aO0JV4lOtFUSZ" + "/DC4qIiwo0VaHNkWCw+bhrERFKeTZcxzHtiElGEeggxwFMvNXBUigU2LoWWLm5BDS9N35iRrfEf6g0HybYe2tOiA717vlKvIMr0t" + "YJmlLLKUB9brEUpdSm8RRLs+jzEY76YT7Uv6WzIq04SetI+GUOMkEXDNvtcSKnE8625L7qmhbiiX4Ub90jCxCqt6JHXrCM1VsYWEn" @@ -59,9 +59,10 @@ void testReadValidFile() { StreamFileSignature streamFileSignature = fileReaderV2.read(streamFileData); assertNotNull(streamFileSignature); assertThat(streamFileSignature.getBytes()).isNotEmpty().isEqualTo(streamFileData.getBytes()); - assertArrayEquals(Base64.decodeBase64(entireFileHashBase64.getBytes()), streamFileSignature.getFileHash()); + assertArrayEquals(Base64.decodeBase64(ENTIRE_FILE_HASH_BASE_64.getBytes()), streamFileSignature.getFileHash()); assertArrayEquals( - Base64.decodeBase64(entireFileSignatureBase64.getBytes()), streamFileSignature.getFileHashSignature()); + Base64.decodeBase64(ENTIRE_FILE_SIGNATURE_BASE_64.getBytes()), + streamFileSignature.getFileHashSignature()); assertEquals(VERSION, streamFileSignature.getVersion()); } diff --git a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/repository/EntityRepositoryTest.java b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/repository/EntityRepositoryTest.java index f35d68fc9d8..ef40d8e8bdc 100644 --- a/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/repository/EntityRepositoryTest.java +++ b/hedera-mirror-importer/src/test/java/com/hedera/mirror/importer/repository/EntityRepositoryTest.java @@ -113,7 +113,7 @@ void findByAlias() { void findByEvmAddress() { Entity entity = domainBuilder.entity().persist(); Entity entityDeleted = - domainBuilder.entity().customize((b) -> b.deleted(true)).persist(); + domainBuilder.entity().customize(b -> b.deleted(true)).persist(); assertThat(entityRepository.findByEvmAddress(entity.getEvmAddress())) .get() .isEqualTo(entity.getId()); diff --git a/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/config/LoggingFilterTest.java b/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/config/LoggingFilterTest.java index a909a0d52a8..887bd5efc11 100644 --- a/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/config/LoggingFilterTest.java +++ b/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/config/LoggingFilterTest.java @@ -120,7 +120,7 @@ void filterOnError(CapturedOutput output) { var exception = new IllegalArgumentException("error"); StepVerifier.withVirtualTime(() -> loggingFilter .filter(exchange, serverWebExchange -> Mono.error(exception)) - .onErrorResume((t) -> exchange.getResponse().setComplete())) + .onErrorResume(t -> exchange.getResponse().setComplete())) .thenAwait(WAIT) .expectComplete() .verify(WAIT); diff --git a/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/health/ReleaseHealthIndicatorTest.java b/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/health/ReleaseHealthIndicatorTest.java index 275617c7ad8..ded73e3dd09 100644 --- a/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/health/ReleaseHealthIndicatorTest.java +++ b/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/health/ReleaseHealthIndicatorTest.java @@ -32,7 +32,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -265,7 +264,7 @@ void sameMono() { } private GenericKubernetesResource helmRelease(List conditions) { - var builtConditions = conditions.stream().map(ConditionBuilder::build).collect(Collectors.toList()); + var builtConditions = conditions.stream().map(ConditionBuilder::build).toList(); Map properties = Map.of("status", Map.of("conditions", builtConditions)); return new GenericKubernetesResourceBuilder() .withKind("HelmRelease") diff --git a/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/publish/generator/ConfigurableTransactionGeneratorTest.java b/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/publish/generator/ConfigurableTransactionGeneratorTest.java index 6056fb0510f..c4c5856a0bd 100644 --- a/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/publish/generator/ConfigurableTransactionGeneratorTest.java +++ b/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/publish/generator/ConfigurableTransactionGeneratorTest.java @@ -59,7 +59,7 @@ void init() { properties.setTps(100_000); properties.setType(TransactionType.CONSENSUS_SUBMIT_MESSAGE); generator = Suppliers.memoize( - () -> new ConfigurableTransactionGenerator(p -> p, p -> Collections.unmodifiableMap(p), properties)); + () -> new ConfigurableTransactionGenerator(p -> p, Collections::unmodifiableMap, properties)); } @Test diff --git a/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/subscribe/SubscribeMetricsTest.java b/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/subscribe/SubscribeMetricsTest.java index 05f231b2706..6dd9c17e9f2 100644 --- a/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/subscribe/SubscribeMetricsTest.java +++ b/hedera-mirror-monitor/src/test/java/com/hedera/mirror/monitor/subscribe/SubscribeMetricsTest.java @@ -26,6 +26,7 @@ import com.hedera.mirror.monitor.ScenarioStatus; import com.hedera.mirror.monitor.subscribe.grpc.GrpcSubscriberProperties; import io.micrometer.core.instrument.MeterRegistry; +import io.micrometer.core.instrument.Timer; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import java.time.Instant; import java.util.concurrent.TimeUnit; @@ -78,7 +79,7 @@ void recordE2E() { assertThat(meterRegistry.find(METRIC_E2E).timers()) .hasSize(1) .first() - .returns(1L, t -> t.count()) + .returns(1L, Timer::count) .returns(2.0, t -> t.mean(TimeUnit.SECONDS)) .returns(2.0, t -> t.max(TimeUnit.SECONDS)) .returns(subscription.getProtocol().toString(), t -> t.getId().getTag(TAG_PROTOCOL)) @@ -92,7 +93,7 @@ void recordE2E() { assertThat(meterRegistry.find(METRIC_E2E).timers()) .hasSize(1) .first() - .returns(2L, t -> t.count()) + .returns(2L, Timer::count) .returns(3.0, t -> t.mean(TimeUnit.SECONDS)) .returns(4.0, t -> t.max(TimeUnit.SECONDS)) .returns(subscription.getProtocol().toString(), t -> t.getId().getTag(TAG_PROTOCOL)) diff --git a/hedera-mirror-rest-java/src/test/java/com/hedera/mirror/restjava/controller/ControllerTest.java b/hedera-mirror-rest-java/src/test/java/com/hedera/mirror/restjava/controller/ControllerTest.java index 8c82ecf615c..a3d7186cb7d 100644 --- a/hedera-mirror-rest-java/src/test/java/com/hedera/mirror/restjava/controller/ControllerTest.java +++ b/hedera-mirror-rest-java/src/test/java/com/hedera/mirror/restjava/controller/ControllerTest.java @@ -79,7 +79,7 @@ protected final void validateError( assertThatThrownBy(callable) .isInstanceOf(clazz) .asInstanceOf(InstanceOfAssertFactories.type(clazz)) - .satisfies(r -> e.set(r)) + .satisfies(e::set) .extracting( r -> r.getResponseBodyAs(Error.class).getStatus().getMessages(), list(ErrorStatusMessagesInner.class)) diff --git a/hedera-mirror-rest-java/src/test/java/com/hedera/mirror/restjava/repository/EntityRepositoryTest.java b/hedera-mirror-rest-java/src/test/java/com/hedera/mirror/restjava/repository/EntityRepositoryTest.java index 0ad728867e8..9423c8fb1fc 100644 --- a/hedera-mirror-rest-java/src/test/java/com/hedera/mirror/restjava/repository/EntityRepositoryTest.java +++ b/hedera-mirror-rest-java/src/test/java/com/hedera/mirror/restjava/repository/EntityRepositoryTest.java @@ -32,9 +32,9 @@ void findByAlias() { var entity = domainBuilder.entity().persist(); byte[] alias = entity.getAlias(); var entityDeleted = - domainBuilder.entity().customize((b) -> b.deleted(true)).persist(); + domainBuilder.entity().customize(b -> b.deleted(true)).persist(); var entityDeletedNull = - domainBuilder.entity().customize((b) -> b.deleted(null)).persist(); + domainBuilder.entity().customize(b -> b.deleted(null)).persist(); assertThat(entityRepository.findByAlias(alias)).get().isEqualTo(entity.getId()); assertThat(entityRepository.findByAlias(entityDeleted.getAlias())).isEmpty(); @@ -45,9 +45,9 @@ void findByAlias() { void findByEvmAddress() { var entity = domainBuilder.entity().persist(); var entityDeleted = - domainBuilder.entity().customize((b) -> b.deleted(true)).persist(); + domainBuilder.entity().customize(b -> b.deleted(true)).persist(); var entityDeletedNull = - domainBuilder.entity().customize((b) -> b.deleted(null)).persist(); + domainBuilder.entity().customize(b -> b.deleted(null)).persist(); assertThat(entityRepository.findByEvmAddress(entity.getEvmAddress())) .get() diff --git a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/FileClient.java b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/FileClient.java index 87d53491275..f1b42f65fbd 100644 --- a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/FileClient.java +++ b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/FileClient.java @@ -40,7 +40,7 @@ public FileClient(SDKClient sdkClient, RetryTemplate retryTemplate) { @Override public void clean() { log.info("Deleting {} files", fileIds.size()); - deleteAll(fileIds, id -> deleteFile(id)); + deleteAll(fileIds, this::deleteFile); } public NetworkTransactionResponse createFile(byte[] content) { diff --git a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/MirrorNodeClient.java b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/MirrorNodeClient.java index 1e536a59604..4b3eda58a02 100644 --- a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/MirrorNodeClient.java +++ b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/MirrorNodeClient.java @@ -127,7 +127,7 @@ public SubscriptionResponse subscribeToTopic(SDKClient sdkClient, TopicMessageQu .atMost(Durations.ONE_MINUTE) .pollInterval(Durations.ONE_SECOND) .pollDelay(Durations.ONE_HUNDRED_MILLISECONDS) - .until(() -> subscriptionResponse.hasResponse()); + .until(subscriptionResponse::hasResponse); if (subscriptionResponse.errorEncountered()) { throw subscriptionResponse.getResponseError(); diff --git a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/ScheduleClient.java b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/ScheduleClient.java index 7e773aeb530..2cc80656b95 100644 --- a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/ScheduleClient.java +++ b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/ScheduleClient.java @@ -43,7 +43,7 @@ public ScheduleClient(SDKClient sdkClient, RetryTemplate retryTemplate) { @Override public void clean() { log.info("Deleting {} schedules", scheduleIds.size()); - deleteAll(scheduleIds, id -> deleteSchedule(id)); + deleteAll(scheduleIds, this::deleteSchedule); } public NetworkTransactionResponse createSchedule( diff --git a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/StartupProbe.java b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/StartupProbe.java index 8f5cd93b88b..60f6c77456d 100644 --- a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/StartupProbe.java +++ b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/client/StartupProbe.java @@ -76,7 +76,7 @@ public TransactionReceipt validateEnvironment(Client client) { client.setMaxNodeReadmitTime(WAIT); log.info("Creating a topic to confirm node connectivity"); - var transactionId = executeTransaction(client, stopwatch, () -> new TopicCreateTransaction()).transactionId; + var transactionId = executeTransaction(client, stopwatch, TopicCreateTransaction::new).transactionId; var receiptQuery = new TransactionReceiptQuery().setTransactionId(transactionId); var receipt = executeQuery(client, stopwatch, () -> receiptQuery); var topicId = receipt.topicId; diff --git a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/ERCContractFeature.java b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/ERCContractFeature.java index 38c7afae019..369240c81d1 100644 --- a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/ERCContractFeature.java +++ b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/ERCContractFeature.java @@ -43,7 +43,6 @@ import io.cucumber.java.After; import io.cucumber.java.en.Given; import io.cucumber.java.en.Then; -import java.io.IOException; import java.math.BigInteger; import java.util.ArrayList; import java.util.List; @@ -215,7 +214,7 @@ public void verifyNftAllowance() { } @Given("I successfully create an erc contract from contract bytes with balance 0") - public void createNewContract() throws IOException { + public void createNewContract() { deployedErcContract = getContract(ERC); ercTestContractSolidityAddress = deployedErcContract.contractId().toSolidityAddress(); } diff --git a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/EstimatePrecompileFeature.java b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/EstimatePrecompileFeature.java index c7bd80fadc5..0b0448a00b7 100644 --- a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/EstimatePrecompileFeature.java +++ b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/EstimatePrecompileFeature.java @@ -110,7 +110,7 @@ public void createNewEstimateContract() throws IOException { } @Given("I create erc test contract with 0 balance") - public void createNewERCContract() throws IOException { + public void createNewERCContract() { deployedErcTestContract = getContract(ERC); ercTestContractSolidityAddress = deployedErcTestContract.contractId().toSolidityAddress(); } @@ -121,7 +121,7 @@ public void getExchangeRate() { } @Given("I successfully create Precompile contract with 0 balance") - public void createNewPrecompileTestContract() throws IOException { + public void createNewPrecompileTestContract() { deployedPrecompileContract = getContract(PRECOMPILE); precompileTestContractSolidityAddress = deployedPrecompileContract.contractId().toSolidityAddress(); diff --git a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/HistoricalFeature.java b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/HistoricalFeature.java index ef71a807e0b..a8cb7bdebf6 100644 --- a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/HistoricalFeature.java +++ b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/HistoricalFeature.java @@ -72,7 +72,6 @@ import io.cucumber.java.en.And; import io.cucumber.java.en.Given; import io.cucumber.java.en.Then; -import java.io.IOException; import java.math.BigInteger; import java.util.HashMap; import java.util.List; @@ -103,26 +102,26 @@ public class HistoricalFeature extends AbstractEstimateFeature { private ExpandedAccountId admin; @Given("I successfully create estimateGas contract") - public void createNewEstimateContract() throws IOException { + public void createNewEstimateContract() { deployedEstimateContract = getContract(ESTIMATE_GAS); estimateContractSolidityAddress = deployedEstimateContract.contractId().toSolidityAddress(); } @Given("I successfully create estimate precompile contract") - public void createNewEstimatePrecompileContract() throws IOException { + public void createNewEstimatePrecompileContract() { deployedEstimatePrecompileContract = getContract(ESTIMATE_PRECOMPILE); estimatePrecompileContractSolidityAddress = deployedEstimatePrecompileContract.contractId().toSolidityAddress(); } @Given("I successfully create erc contract") - public void createNewErcContract() throws IOException { + public void createNewErcContract() { deployedErcContract = getContract(ERC); ercContractSolidityAddress = deployedErcContract.contractId().toSolidityAddress(); } @Given("I successfully create precompile contract") - public void createNewPrecompileContract() throws IOException { + public void createNewPrecompileContract() { deployedPrecompileContract = getContract(PRECOMPILE); precompileContractSolidityAddress = deployedPrecompileContract.contractId().toSolidityAddress(); @@ -317,7 +316,7 @@ public void getHistoricalDataForTokenInfoWhenDoingBurn(TokenNameEnum tokenName) } @Then("I verify that historical data for {token} is returned via getTokenInfo when doing mint") - public void getHistoricalDataForTokenInfoWhenDoingMint(TokenNameEnum tokenName) throws InterruptedException { + public void getHistoricalDataForTokenInfoWhenDoingMint(TokenNameEnum tokenName) { var tokenId = tokenClient.getToken(tokenName).tokenId(); var data = encodeData(PRECOMPILE, GET_TOKEN_INFO, asAddress(tokenId)); @@ -774,7 +773,7 @@ public void updateAccountAndTokenKeys(TokenNameEnum tokenName) } @Then("I verify historical data for {token} is returned for getTokenKey") - public void getHistoricalDataForGetTokenKey(TokenNameEnum tokenName) throws InterruptedException { + public void getHistoricalDataForGetTokenKey(TokenNameEnum tokenName) { var tokenId = tokenClient.getToken(tokenName).tokenId(); var initialBlockNumber = getLastBlockNumber(); BigInteger[] tokenKeyValues = { diff --git a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/PrecompileContractFeature.java b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/PrecompileContractFeature.java index 4c8fdbd425a..da784fb8e07 100644 --- a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/PrecompileContractFeature.java +++ b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/steps/PrecompileContractFeature.java @@ -70,7 +70,6 @@ import io.cucumber.java.en.And; import io.cucumber.java.en.Given; import io.cucumber.java.en.Then; -import java.io.IOException; import java.math.BigInteger; import java.util.List; import lombok.CustomLog; @@ -95,7 +94,7 @@ public class PrecompileContractFeature extends AbstractFeature { private String precompileTestContractSolidityAddress; @Given("I successfully create and verify a precompile contract from contract bytes") - public void createNewContract() throws IOException { + public void createNewContract() { deployedPrecompileContract = getContract(PRECOMPILE); precompileTestContractSolidityAddress = deployedPrecompileContract.contractId().toSolidityAddress(); diff --git a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/util/TestUtil.java b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/util/TestUtil.java index 5a317703150..5e3e786155d 100644 --- a/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/util/TestUtil.java +++ b/hedera-mirror-test/src/test/java/com/hedera/mirror/test/e2e/acceptance/util/TestUtil.java @@ -149,7 +149,7 @@ public static Tuple nftAmount(String sender, String receiver, Long serialNumber, } public static Address[] asAddressArray(List addressStrings) { - return addressStrings.stream().map(addr -> asAddress(addr)).toArray(Address[]::new); + return addressStrings.stream().map(TestUtil::asAddress).toArray(Address[]::new); } public static byte[][] asByteArray(List hexStringList) { diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/RWCachingStateFrameTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/RWCachingStateFrameTest.java index 48a156005aa..d435ade5df9 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/RWCachingStateFrameTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/RWCachingStateFrameTest.java @@ -71,10 +71,10 @@ void updatesFromDownstreamRequiresSameClassesRegistered() { void updatesFromDownStreamCoalesceProperly() { enum CacheKind { - thisC, - thisS, - downC, - downS + THIS_C, + THIS_S, + DOWN_C, + DOWN_S } final EnumMap> caches = new EnumMap<>(CacheKind.class); @@ -87,9 +87,9 @@ enum CacheKind { Mockito.spy(new BottomCachingStateFrame(Optional.empty(), Character.class, String.class)); final var sutInternalCaches = - Map.of(Character.class, caches.get(CacheKind.thisC), String.class, caches.get(CacheKind.thisS)); + Map.of(Character.class, caches.get(CacheKind.THIS_C), String.class, caches.get(CacheKind.THIS_S)); final var downstreamInternalCaches = - Map.of(Character.class, caches.get(CacheKind.downC), String.class, caches.get(CacheKind.downS)); + Map.of(Character.class, caches.get(CacheKind.DOWN_C), String.class, caches.get(CacheKind.DOWN_S)); final var sut = Mockito.spy(new RWCachingStateFrame(Optional.empty(), Character.class, String.class)); @@ -98,7 +98,7 @@ enum CacheKind { sut.updatesFromDownstream(downstreamFrame); - verify(caches.get(CacheKind.thisC), times(1)).coalesceFrom(caches.get(CacheKind.downC)); - verify(caches.get(CacheKind.thisS), times(1)).coalesceFrom(caches.get(CacheKind.downS)); + verify(caches.get(CacheKind.THIS_C), times(1)).coalesceFrom(caches.get(CacheKind.DOWN_C)); + verify(caches.get(CacheKind.THIS_S), times(1)).coalesceFrom(caches.get(CacheKind.DOWN_S)); } } diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/EntityAddressSequencerTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/EntityAddressSequencerTest.java index cf2afdbce8f..aef2a625e73 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/EntityAddressSequencerTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/EntityAddressSequencerTest.java @@ -29,8 +29,8 @@ @ExtendWith(MockitoExtension.class) class EntityAddressSequencerTest { - private static final long contractNum = 1_000_000_000L; - private static final Address sponsor = new Id(0, 0, contractNum).asEvmAddress(); + private static final long CONTRACT_NUM = 1_000_000_000L; + private static final Address sponsor = new Id(0, 0, CONTRACT_NUM).asEvmAddress(); @InjectMocks private EntityAddressSequencer entityAddressSequencer; @@ -40,7 +40,7 @@ void getNewContractId() { assertThat(entityAddressSequencer.getNewContractId(sponsor)) .returns(0L, ContractID::getShardNum) .returns(0L, ContractID::getRealmNum) - .returns(contractNum, ContractID::getContractNum); + .returns(CONTRACT_NUM, ContractID::getContractNum); } @Test @@ -58,7 +58,7 @@ void getNewAccountId() { @Test void getNextEntityIdReturnsNextId() { final var actualAddress = entityAddressSequencer.getNewContractId(sponsor); - assertThat(actualAddress.getContractNum()).isEqualTo(contractNum); + assertThat(actualAddress.getContractNum()).isEqualTo(CONTRACT_NUM); } @Test @@ -67,6 +67,6 @@ void getNextEntityIdWorksCorrectlyAfterMultipleCalls() { entityAddressSequencer.getNewContractId(sponsor); final var actual = entityAddressSequencer.getNewContractId(sponsor); - assertThat(actual.getContractNum()).isEqualTo(contractNum + 2); + assertThat(actual.getContractNum()).isEqualTo(CONTRACT_NUM + 2); } } diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/HederaEvmStackedWorldStateUpdaterTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/HederaEvmStackedWorldStateUpdaterTest.java index 703147017d1..f203d276ef8 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/HederaEvmStackedWorldStateUpdaterTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/HederaEvmStackedWorldStateUpdaterTest.java @@ -58,11 +58,11 @@ @ExtendWith(ContextExtension.class) @ExtendWith(MockitoExtension.class) class HederaEvmStackedWorldStateUpdaterTest { - private static final Address alias = Address.fromHexString("0xabcdefabcdefabcdefbabcdefabcdefabcdefbbb"); - private static final Address alias2 = Address.fromHexString("0xabcdefabcdefabcdefbabcdefabcdefabcdefbbc"); - private static final Address sponsor = Address.fromHexString("0xcba"); - private static final long aBalance = 1_000L; - private static final long aNonce = 1L; + private static final Address ALIAS = Address.fromHexString("0xabcdefabcdefabcdefbabcdefabcdefabcdefbbb"); + private static final Address ALIAS_2 = Address.fromHexString("0xabcdefabcdefabcdefbabcdefabcdefabcdefbbc"); + private static final Address SPONSOR = Address.fromHexString("0xcba"); + private static final long A_BALANCE = 1_000L; + private static final long A_NONCE = 1L; private final Address address = Address.fromHexString("0x000000000000000000000000000000000000077e"); private final UpdateTrackingAccount updatedHederaEvmAccount = new UpdateTrackingAccount<>(address, null); @@ -136,11 +136,11 @@ void commitsNewlyCreatedAccountAsExpected() { store); when(mirrorEvmContractAliases.resolveForEvm(address)).thenReturn(address); store.wrap(); - subject.createAccount(address, aNonce, Wei.of(aBalance)); + subject.createAccount(address, A_NONCE, Wei.of(A_BALANCE)); assertNull(updater.getAccount(address)); subject.commit(); - assertThat(subject.getAccount(address).getNonce()).isEqualTo(aNonce); - assertThat(updater.getAccount(address).getNonce()).isEqualTo(aNonce); + assertThat(subject.getAccount(address).getNonce()).isEqualTo(A_NONCE); + assertThat(updater.getAccount(address).getNonce()).isEqualTo(A_NONCE); } @Test @@ -157,7 +157,7 @@ void commitsDeletedAccountsAsExpected() { store); when(mirrorEvmContractAliases.resolveForEvm(address)).thenReturn(address); store.wrap(); - subject.createAccount(address, aNonce, Wei.of(aBalance)); + subject.createAccount(address, A_NONCE, Wei.of(A_BALANCE)); subject.deleteAccount(address); assertThat(updater.getDeletedAccountAddresses()).isEmpty(); subject.commit(); @@ -268,18 +268,18 @@ void getSbhRefundReturnsZero() { @Test void usesAliasesForDecodingHelpForV38() { - given(mirrorEvmContractAliases.resolveForEvm(alias)).willReturn(sponsor); - given(tokenAccessor.canonicalAddress(alias)).willReturn(alias); + given(mirrorEvmContractAliases.resolveForEvm(ALIAS)).willReturn(SPONSOR); + given(tokenAccessor.canonicalAddress(ALIAS)).willReturn(ALIAS); - final var resolved = subject.unaliased(alias.toArrayUnsafe()); - assertArrayEquals(sponsor.toArrayUnsafe(), resolved); + final var resolved = subject.unaliased(ALIAS.toArrayUnsafe()); + assertArrayEquals(SPONSOR.toArrayUnsafe(), resolved); } @Test void unaliasingFailsWhenNotUsingCanonicalAddressForV38() { - given(tokenAccessor.canonicalAddress(alias)).willReturn(alias2); + given(tokenAccessor.canonicalAddress(ALIAS)).willReturn(ALIAS_2); - assertArrayEquals(new byte[20], subject.unaliased(alias.toArrayUnsafe())); + assertArrayEquals(new byte[20], subject.unaliased(ALIAS.toArrayUnsafe())); } @Test @@ -335,7 +335,7 @@ private void deleteTestAccount(Address treasuryAddress) { private com.hedera.services.store.models.Account createTestAccount(Address treasuryAddress) { when(mirrorEvmContractAliases.resolveForEvm(treasuryAddress)).thenReturn(treasuryAddress); store.wrap(); - subject.createAccount(treasuryAddress, aNonce, Wei.of(aBalance)); + subject.createAccount(treasuryAddress, A_NONCE, Wei.of(A_BALANCE)); subject.commit(); return store.getAccount(treasuryAddress, OnMissing.THROW); } diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/MirrorEntityAccessTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/MirrorEntityAccessTest.java index de3c61bea9b..2a5080415e8 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/MirrorEntityAccessTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/evm/store/contract/MirrorEntityAccessTest.java @@ -124,7 +124,6 @@ void isUsableWithNotExpiredTimestamp() { @Disabled("Expiry not enabled on network; these tests need to account for feature flags; see #6941") @Test void isNotUsableWithExpiredAutoRenewTimestamp() { - final long autoRenewPeriod = Instant.MAX.getEpochSecond(); when(store.getAccount(ADDRESS, OnMissing.DONT_THROW)).thenReturn(Account.getEmptyAccount()); final var result = mirrorEntityAccess.isUsable(ADDRESS); assertThat(result).isFalse(); diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/AccountBalanceRepositoryTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/AccountBalanceRepositoryTest.java index 6d8104e0669..79db6f0bc94 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/AccountBalanceRepositoryTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/AccountBalanceRepositoryTest.java @@ -131,13 +131,14 @@ void shouldGetBalanceWhenAccountBalanceEntryIsMissingTimestampBeforeTheAccountCr .persist(); long accountCreationTimestamp = account.getCreatedTimestamp(); - // account creation initial transfer var initialTransfer = domainBuilder .cryptoTransfer() .customize( b -> b.amount(initialBalance).entityId(accountId).consensusTimestamp(accountCreationTimestamp)) .persist(); - var secondTransfer = domainBuilder + + // second transfer + domainBuilder .cryptoTransfer() .customize(b -> b.amount(TRANSFER_AMOUNT) .entityId(accountId) diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/CryptoAllowanceRepositoryTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/CryptoAllowanceRepositoryTest.java index 26e5697b024..4f9d89737e6 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/CryptoAllowanceRepositoryTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/CryptoAllowanceRepositoryTest.java @@ -137,7 +137,8 @@ void findByOwnerAndTimestampWithTransferHappyPath() { .timestampRange(Range.atLeast(cryptoAllowanceTimestamp))) .persist(); - final var allowanceHistory = domainBuilder + // allowance history + domainBuilder .cryptoAllowanceHistory() .customize(a -> a.spender(spender + 1) .owner(ownerId) @@ -145,7 +146,8 @@ void findByOwnerAndTimestampWithTransferHappyPath() { .timestampRange(Range.atLeast(cryptoAllowanceTimestamp))) .persist(); - final var cryptoTransfer = domainBuilder + // cryptoTransfer + domainBuilder .cryptoTransfer() .customize(c -> c.entityId(ownerId) .payerAccountId(EntityId.of(spender)) @@ -154,7 +156,8 @@ void findByOwnerAndTimestampWithTransferHappyPath() { .consensusTimestamp(cryptoTransferTimestamp)) .persist(); - final var cryptoTransfer1 = domainBuilder + // another cryptoTransfer + domainBuilder .cryptoTransfer() .customize(c -> c.entityId(ownerId) .payerAccountId(EntityId.of(spender + 1)) @@ -185,7 +188,8 @@ void findByOwnerAndTimestampWithTransferMultipleEntries() { .timestampRange(Range.atLeast(cryptoAllowanceTimestamp))) .persist(); - final var allowanceHistory = domainBuilder + // allowance history + domainBuilder .cryptoAllowanceHistory() .customize(a -> a.spender(spender + 1) .owner(ownerId) @@ -193,7 +197,8 @@ void findByOwnerAndTimestampWithTransferMultipleEntries() { .timestampRange(Range.atLeast(cryptoAllowanceTimestamp))) .persist(); - final var cryptoTransfer = domainBuilder + // crypto transfer + domainBuilder .cryptoTransfer() .customize(c -> c.entityId(ownerId) .payerAccountId(EntityId.of(spender)) @@ -202,7 +207,8 @@ void findByOwnerAndTimestampWithTransferMultipleEntries() { .consensusTimestamp(cryptoTransferTimestamp)) .persist(); - final var cryptoTransfer1 = domainBuilder + // another crypto transfer + domainBuilder .cryptoTransfer() .customize(c -> c.entityId(ownerId) .payerAccountId(EntityId.of(spender)) @@ -211,7 +217,8 @@ void findByOwnerAndTimestampWithTransferMultipleEntries() { .consensusTimestamp(cryptoTransferTimestamp)) .persist(); - final var cryptoTransfer2 = domainBuilder + // yet another crypto transfer + domainBuilder .cryptoTransfer() .customize(c -> c.entityId(ownerId) .payerAccountId(EntityId.of(spender + 1)) @@ -243,7 +250,7 @@ void findByOwnerAndTimestampWithTransferAfterBlockTimestamp() { .persist(); // This transfer should not be selected and the amount should not be subtracted from the allowance. - final var cryptoTransfer = domainBuilder + domainBuilder .cryptoTransfer() .customize(c -> c.entityId(owner) .payerAccountId(EntityId.of(spender)) @@ -261,7 +268,6 @@ void findByOwnerAndTimestampWithTransferAfterBlockTimestamp() { void findByOwnerAndTimestampWithAmountGrantedZeroReturnsEmpty() { long owner = 1L; long cryptoAllowanceTimestamp = System.currentTimeMillis(); - long cryptoTransferTimestamp = cryptoAllowanceTimestamp + 1; long blockTimestamp = cryptoAllowanceTimestamp + 2; final var allowance = domainBuilder @@ -290,7 +296,8 @@ void findByOwnerAndTimestampWithFullTransferReturnsEmpty() { .timestampRange(Range.atLeast(cryptoAllowanceTimestamp))) .persist(); - final var cryptoTransfer = domainBuilder + // crypto transfer + domainBuilder .cryptoTransfer() .customize(c -> c.entityId(ownerId) .payerAccountId(EntityId.of(spender)) diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/TokenAccountRepositoryTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/TokenAccountRepositoryTest.java index 58e6b2b8cb5..f512d8867a0 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/TokenAccountRepositoryTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/TokenAccountRepositoryTest.java @@ -86,29 +86,29 @@ void findByIdMissingToken(TokenFreezeStatusEnum freezeStatus, TokenKycStatusEnum @Test void countByAccountIdAndAssociatedGroupedByBalanceIsPositive() { - long accountId = 22L; - long nextAccountId = accountId + 1L; + long accId = 22L; + long nextAccountId = accId + 1L; domainBuilder .tokenAccount() - .customize(a -> a.associated(true).balance(23).accountId(accountId)) + .customize(a -> a.associated(true).balance(23).accountId(accId)) .persist(); domainBuilder .tokenAccount() - .customize(a -> a.associated(true).balance(24).accountId(accountId)) + .customize(a -> a.associated(true).balance(24).accountId(accId)) .persist(); domainBuilder .tokenAccount() - .customize(a -> a.associated(true).balance(0).accountId(accountId)) + .customize(a -> a.associated(true).balance(0).accountId(accId)) .persist(); domainBuilder .tokenAccount() - .customize(a -> a.associated(false).accountId(accountId)) + .customize(a -> a.associated(false).accountId(accId)) .persist(); domainBuilder.tokenAccount().customize(a -> a.accountId(nextAccountId)).persist(); var expected = List.of(tuple(true, 2), tuple(false, 1)); - assertThat(repository.countByAccountIdAndAssociatedGroupedByBalanceIsPositive(accountId)) + assertThat(repository.countByAccountIdAndAssociatedGroupedByBalanceIsPositive(accId)) .extracting( TokenAccountAssociationsCount::getIsPositiveBalance, TokenAccountAssociationsCount::getTokenCount) @@ -116,7 +116,7 @@ void countByAccountIdAndAssociatedGroupedByBalanceIsPositive() { // Verify cached result repository.deleteAll(); - assertThat(repository.countByAccountIdAndAssociatedGroupedByBalanceIsPositive(accountId)) + assertThat(repository.countByAccountIdAndAssociatedGroupedByBalanceIsPositive(accId)) .extracting( TokenAccountAssociationsCount::getIsPositiveBalance, TokenAccountAssociationsCount::getTokenCount) @@ -215,7 +215,7 @@ void findByIdAndTimestampHistoricalReturnsLatestEntry( TokenKycStatusEnum kycStatus, TokenFreezeStatusEnum expectedFreezeStatus, TokenKycStatusEnum expectedKycStatus) { - long accountId = 2L; + long accId = 2L; final var token = domainBuilder .token() .customize(t -> t.freezeStatus(tokenFreezeStatus).kycStatus(tokenKycStatus)) @@ -223,7 +223,7 @@ void findByIdAndTimestampHistoricalReturnsLatestEntry( final var tokenAccountHistory1 = domainBuilder .tokenAccountHistory() .customize(t -> t.tokenId(token.getTokenId()) - .accountId(accountId) + .accountId(accId) .freezeStatus(freezeStatus) .kycStatus(kycStatus)) .persist(); @@ -231,7 +231,7 @@ void findByIdAndTimestampHistoricalReturnsLatestEntry( final var tokenAccountHistory2 = domainBuilder .tokenAccountHistory() .customize(t -> t.tokenId(token.getTokenId()) - .accountId(accountId) + .accountId(accId) .freezeStatus(freezeStatus) .kycStatus(kycStatus)) .persist(); @@ -256,12 +256,12 @@ void findByIdAndTimestampHistoricalReturnsLatestEntry( @ParameterizedTest void findByIdAndTimestampHistoricalMissingTokenReturnsLatestEntry( TokenFreezeStatusEnum freezeStatus, TokenKycStatusEnum kycStatus) { - long accountId = 2L; + long accId = 2L; long tokenId = 102L; final var tokenAccountHistory1 = domainBuilder .tokenAccountHistory() .customize(t -> t.tokenId(tokenId) - .accountId(accountId) + .accountId(accId) .freezeStatus(freezeStatus) .kycStatus(kycStatus)) .persist(); @@ -269,7 +269,7 @@ void findByIdAndTimestampHistoricalMissingTokenReturnsLatestEntry( final var tokenAccountHistory2 = domainBuilder .tokenAccountHistory() .customize(t -> t.tokenId(tokenId) - .accountId(accountId) + .accountId(accId) .freezeStatus(freezeStatus) .kycStatus(kycStatus)) .persist(); @@ -401,22 +401,19 @@ void countByAccountIdAndTimestampHistoricalGreaterThanBlock() { @Test void countByAccountIdAndTimestampHistoricalReturnsLatestEntry() { - long accountId = 2L; + long accId = 2L; domainBuilder .tokenAccountHistory() - .customize(ta -> ta.accountId(accountId).balance(0)) - .persist(); - domainBuilder - .tokenAccountHistory() - .customize(ta -> ta.accountId(accountId)) + .customize(ta -> ta.accountId(accId).balance(0)) .persist(); + domainBuilder.tokenAccountHistory().customize(ta -> ta.accountId(accId)).persist(); final var tokenAccountHistory = domainBuilder .tokenAccountHistory() - .customize(ta -> ta.accountId(accountId)) + .customize(ta -> ta.accountId(accId)) .persist(); assertThat(repository.countByAccountIdAndTimestampAndAssociatedGroupedByBalanceIsPositive( - accountId, tokenAccountHistory.getTimestampLower() + 1)) + accId, tokenAccountHistory.getTimestampLower() + 1)) .hasSize(2) .extracting( TokenAccountAssociationsCount::getIsPositiveBalance, diff --git a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/TokenAllowanceRepositoryTest.java b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/TokenAllowanceRepositoryTest.java index 29d28327c04..907b763342c 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/TokenAllowanceRepositoryTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/mirror/web3/repository/TokenAllowanceRepositoryTest.java @@ -172,7 +172,8 @@ void findByOwnerAndTimestampWithTransferHappyPath() { .timestampRange(Range.atLeast(tokenAllowanceTimestamp))) .persist(); - final var allowanceHistory = domainBuilder + // allowance history + domainBuilder .tokenAllowanceHistory() .customize(a -> a.owner(ownerId) .amountGranted(initialAmount) @@ -182,7 +183,8 @@ void findByOwnerAndTimestampWithTransferHappyPath() { .timestampRange(Range.open(tokenAllowanceTimestamp, tokenAllowanceTimestamp + 1000))) .persist(); - final var tokenTransfer = domainBuilder + // token transfer + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -194,7 +196,8 @@ void findByOwnerAndTimestampWithTransferHappyPath() { .build())) .persist(); - final var tokenTransfer1 = domainBuilder + // another token transfer + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -240,7 +243,8 @@ void findByOwnerAndTimestampWithHistoryTransferOverlaps() { .timestampRange(Range.atLeast(tokenAllowanceTimestamp))) .persist(); - var allowance2 = domainBuilder + // another token allowance + domainBuilder .tokenAllowance() .customize(a -> a.owner(ownerId) .amountGranted(initialAmount) @@ -250,7 +254,8 @@ void findByOwnerAndTimestampWithHistoryTransferOverlaps() { .timestampRange(Range.atLeast(historyRange.lowerEndpoint()))) .persist(); - var tokenTransfer = domainBuilder + // token transfer + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -274,7 +279,8 @@ void findByOwnerAndTimestampWithHistoryTransferOverlaps() { .build())) .persist(); - var allowanceHistory = domainBuilder + // allowance history + domainBuilder .tokenAllowanceHistory() .customize(a -> a.owner(ownerId) .amountGranted(initialHistoryAmount) @@ -307,7 +313,8 @@ void findByOwnerAndTimestampWithHistoryTransferOverlaps() { .build())) .persist(); - var contractResult = domainBuilder + // contract result + domainBuilder .contractResult() .customize( c -> c.consensusTimestamp(contractCallTransfer.getId().getConsensusTimestamp()) @@ -361,7 +368,8 @@ void findByOwnerAndTimestampWithTransferMultipleEntries() { .timestampRange(Range.atLeast(tokenAllowanceTimestamp))) .persist(); - final var allowanceHistory = domainBuilder + // allowance history + domainBuilder .tokenAllowanceHistory() .customize(a -> a.owner(ownerId) .amountGranted(initialAmount) @@ -371,7 +379,8 @@ void findByOwnerAndTimestampWithTransferMultipleEntries() { .timestampRange(Range.open(tokenAllowanceTimestamp, tokenAllowanceTimestamp + 1000))) .persist(); - final var tokenTransfer = domainBuilder + // token transfer + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -383,7 +392,8 @@ void findByOwnerAndTimestampWithTransferMultipleEntries() { .build())) .persist(); - final var tokenTransfer1 = domainBuilder + // another token transfer + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer1) @@ -423,7 +433,7 @@ void findByOwnerAndTimestampWithTransferAfterBlockTimestamp() { .persist(); // This transfer should not be selected and the amount should not be subtracted from the allowance. - final var tokenTransfer = domainBuilder + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(-1) @@ -463,7 +473,8 @@ void findByOwnerAndTimestampWithContractTransfer() { .timestampRange(Range.atLeast(tokenAllowanceTimestamp))) .persist(); - final var tokenTransfer = domainBuilder + // token transfer + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -507,7 +518,8 @@ void findByOwnerAndTimestampWithContractTransferAfterBlockTimestamp() { .timestampRange(Range.atLeast(tokenAllowanceTimestamp))) .persist(); - final var tokenTransfer = domainBuilder + // token transfer + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -519,7 +531,8 @@ void findByOwnerAndTimestampWithContractTransferAfterBlockTimestamp() { .build())) .persist(); - final var contractResult = domainBuilder + // contract result + domainBuilder .contractResult() .customize(c -> c.consensusTimestamp(tokenTransferTimestamp).senderId(EntityId.of(senderId))) .persist(); @@ -552,7 +565,8 @@ void findByOwnerAndTimestampWithRegularTokenTransfersAndContractTokenTransfers() .timestampRange(Range.atLeast(tokenAllowanceTimestamp))) .persist(); - final var tokenTransfer = domainBuilder + // token transfer + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -564,7 +578,8 @@ void findByOwnerAndTimestampWithRegularTokenTransfersAndContractTokenTransfers() .build())) .persist(); - final var contractTokenTransfer = domainBuilder + // contract token transfer + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -576,7 +591,8 @@ void findByOwnerAndTimestampWithRegularTokenTransfersAndContractTokenTransfers() .build())) .persist(); - final var contractResult = domainBuilder + // contract result + domainBuilder .contractResult() .customize(c -> c.consensusTimestamp(tokenTransfer1Timestamp).senderId(EntityId.of(senderId))) .persist(); @@ -611,7 +627,8 @@ void findByOwnerAndTimestampPreventDoubleTransferDecrease() { .timestampRange(Range.atLeast(tokenAllowanceTimestamp))) .persist(); - final var allowance1 = domainBuilder + // another token allowance + domainBuilder .tokenAllowance() .customize(a -> a.owner(ownerId) .amountGranted(initialAmount) @@ -621,8 +638,8 @@ void findByOwnerAndTimestampPreventDoubleTransferDecrease() { .timestampRange(Range.atLeast(tokenAllowanceTimestamp1))) .persist(); - // Must be decreased only for the second allowance - final var tokenTransfer = domainBuilder + // token transfer, must be decreased only for the second allowance + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -634,8 +651,8 @@ void findByOwnerAndTimestampPreventDoubleTransferDecrease() { .build())) .persist(); - // Must be decreased only for the first allowance - final var tokenTransfer1 = domainBuilder + // token transfer, must be decreased only for the first allowance + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -647,8 +664,8 @@ void findByOwnerAndTimestampPreventDoubleTransferDecrease() { .build())) .persist(); - // Must be decreased only for the first allowance - final var contractTokenTransfer = domainBuilder + // contract token transfer, must be decreased only for the first allowance + domainBuilder .tokenTransfer() .customize(t -> t.isApproval(true) .amount(amountForTransfer) @@ -660,7 +677,8 @@ void findByOwnerAndTimestampPreventDoubleTransferDecrease() { .build())) .persist(); - final var contractResult = domainBuilder + // contact result + domainBuilder .contractResult() .customize(c -> c.consensusTimestamp(tokenTransfer2Timestamp).senderId(EntityId.of(senderId))) .persist(); @@ -823,7 +841,6 @@ void findByOwnerSpenderTokenAndTimestampWithContractTransferAfterBlockTimestamp( void findByOwnerSpenderTokenAndTimestampWithRegularTokenTransfersAndContractTokenTransfers() { long ownerId = 100L; long tokenId = 200L; - long spenderId = 300L; long senderId = 400L; long tokenAllowanceTimestamp = System.currentTimeMillis(); long tokenTransferTimestamp = tokenAllowanceTimestamp + 100; diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/contracts/execution/LivePricesSourceTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/contracts/execution/LivePricesSourceTest.java index 804f5bc392d..efbdf01b1a3 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/contracts/execution/LivePricesSourceTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/contracts/execution/LivePricesSourceTest.java @@ -36,19 +36,19 @@ @ExtendWith(MockitoExtension.class) class LivePricesSourceTest { - private static final Instant now = Instant.ofEpochSecond(1_234_567L); - private static final Timestamp timeNow = asTimestamp(now); - private static final long gasPriceTinybars = 123; - private static final long sbhPriceTinybars = 456; - private static final FeeComponents servicePrices = FeeComponents.newBuilder() - .setGas(gasPriceTinybars * 1000) - .setSbh(sbhPriceTinybars * 1000) + private static final Instant NOW = Instant.ofEpochSecond(1_234_567L); + private static final Timestamp TIME_NOW = asTimestamp(NOW); + private static final long GAS_PRICE_TINYBARS = 123; + private static final long SBH_PRICE_TINYBARS = 456; + private static final FeeComponents SERVICE_PRICES = FeeComponents.newBuilder() + .setGas(GAS_PRICE_TINYBARS * 1000) + .setSbh(SBH_PRICE_TINYBARS * 1000) .build(); - private static final FeeData providerPrices = - FeeData.newBuilder().setServicedata(servicePrices).build(); - private static final ExchangeRate activeRate = + private static final FeeData PROVIDER_PRICES = + FeeData.newBuilder().setServicedata(SERVICE_PRICES).build(); + private static final ExchangeRate ACTIVE_RATE = ExchangeRate.newBuilder().setHbarEquiv(1).setCentEquiv(12).build(); - private static final long reasonableMultiplier = 1; + private static final long REASONABLE_MULTIPLIER = 1; @Mock private HbarCentExchange exchange; @@ -72,15 +72,15 @@ void setUp() { @Test void getsExpectedGasPriceWithReasonableMultiplier() { - givenCollabsWithMultiplier(reasonableMultiplier); + givenCollabsWithMultiplier(REASONABLE_MULTIPLIER); - final var expected = getTinybarsFromTinyCents(activeRate, gasPriceTinybars) * reasonableMultiplier; + final var expected = getTinybarsFromTinyCents(ACTIVE_RATE, GAS_PRICE_TINYBARS) * REASONABLE_MULTIPLIER; - assertEquals(expected, subject.currentGasPrice(now, ContractCall)); + assertEquals(expected, subject.currentGasPrice(NOW, ContractCall)); } private void givenCollabsWithMultiplier(final long multiplier) { - given(exchange.rate(timeNow)).willReturn(activeRate); - given(usagePrices.defaultPricesGiven(ContractCall, timeNow)).willReturn(providerPrices); + given(exchange.rate(TIME_NOW)).willReturn(ACTIVE_RATE); + given(usagePrices.defaultPricesGiven(ContractCall, TIME_NOW)).willReturn(PROVIDER_PRICES); } } diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/fees/BasicHbarCentExchangeTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/fees/BasicHbarCentExchangeTest.java index eab0c6cd144..0f6a1eaeae4 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/fees/BasicHbarCentExchangeTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/fees/BasicHbarCentExchangeTest.java @@ -35,14 +35,14 @@ @ExtendWith(MockitoExtension.class) class BasicHbarCentExchangeTest { - private static final long crossoverTime = 1_234_567L; - private static final ExchangeRateSet rates = ExchangeRateSet.newBuilder() + private static final long CROSSOVER_TIME = 1_234_567L; + private static final ExchangeRateSet RATES = ExchangeRateSet.newBuilder() .setCurrentRate(ExchangeRate.newBuilder() .setHbarEquiv(1) .setCentEquiv(12) - .setExpirationTime(TimestampSeconds.newBuilder().setSeconds(crossoverTime))) + .setExpirationTime(TimestampSeconds.newBuilder().setSeconds(CROSSOVER_TIME))) .setNextRate(ExchangeRate.newBuilder() - .setExpirationTime(TimestampSeconds.newBuilder().setSeconds(crossoverTime * 2)) + .setExpirationTime(TimestampSeconds.newBuilder().setSeconds(CROSSOVER_TIME * 2)) .setHbarEquiv(1) .setCentEquiv(24)) .build(); @@ -54,7 +54,7 @@ class BasicHbarCentExchangeTest { @BeforeEach void setUp() { - when(ratesAndFeesLoader.loadExchangeRates(anyLong())).thenReturn(rates); + when(ratesAndFeesLoader.loadExchangeRates(anyLong())).thenReturn(RATES); subject = new BasicHbarCentExchange(ratesAndFeesLoader); } @@ -70,18 +70,18 @@ void updatesRatesWhenRatesCalled() { void returnsCurrentRatesWhenBeforeCrossTime() { final var result = subject.rate(beforeCrossTime); - assertEquals(rates.getCurrentRate(), result); + assertEquals(RATES.getCurrentRate(), result); } @Test void returnsNextRatesWhenAfterCrossTime() { final var result = subject.rate(afterCrossTime); - assertEquals(rates.getNextRate(), result); + assertEquals(RATES.getNextRate(), result); } private static final Timestamp beforeCrossTime = - Timestamp.newBuilder().setSeconds(crossoverTime - 1).build(); + Timestamp.newBuilder().setSeconds(CROSSOVER_TIME - 1).build(); private static final Timestamp afterCrossTime = - Timestamp.newBuilder().setSeconds(crossoverTime).build(); + Timestamp.newBuilder().setSeconds(CROSSOVER_TIME).build(); } diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/fees/calc/OverflowCheckingCalcTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/fees/calc/OverflowCheckingCalcTest.java index 2e37b62b0ef..057c36ccd74 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/fees/calc/OverflowCheckingCalcTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/fees/calc/OverflowCheckingCalcTest.java @@ -30,69 +30,69 @@ import org.junit.jupiter.api.Test; class OverflowCheckingCalcTest { - private static final int rateTinybarComponent = 1001; - private static final int rateTinycentComponent = 1000; - private static final ExchangeRate someRate = ExchangeRate.newBuilder() - .setHbarEquiv(rateTinybarComponent) - .setCentEquiv(rateTinycentComponent) + private static final int RATE_TINYBAR_COMPONENT = 1001; + private static final int RATE_TINYCENT_COMPONENT = 1000; + private static final ExchangeRate SOME_RATE = ExchangeRate.newBuilder() + .setHbarEquiv(RATE_TINYBAR_COMPONENT) + .setCentEquiv(RATE_TINYCENT_COMPONENT) .build(); - private static final OverflowCheckingCalc subject = new OverflowCheckingCalc(); + private static final OverflowCheckingCalc SUBJECT = new OverflowCheckingCalc(); @Test void throwsOnMultiplierOverflow() { final var usage = new UsageAccumulator(); - copyData(mockUsage, usage); + copyData(MOCK_USAGE, usage); - assertThrows(IllegalArgumentException.class, () -> subject.fees(usage, mockPrices, mockRate, Long.MAX_VALUE)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.fees(usage, mockPrices, mockRate, Long.MAX_VALUE)); } @Test void converterCanFallbackToBigDecimal() { - final var highFee = Long.MAX_VALUE / rateTinycentComponent; - final var expectedTinybarFee = FeeBuilder.getTinybarsFromTinyCents(someRate, highFee); + final var highFee = Long.MAX_VALUE / RATE_TINYCENT_COMPONENT; + final var expectedTinybarFee = FeeBuilder.getTinybarsFromTinyCents(SOME_RATE, highFee); - final long computedTinybarFee = OverflowCheckingCalc.tinycentsToTinybars(highFee, someRate); + final long computedTinybarFee = OverflowCheckingCalc.tinycentsToTinybars(highFee, SOME_RATE); assertEquals(expectedTinybarFee, computedTinybarFee); } @Test void safeAccumulateTwoWorks() { - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateTwo(-1, 1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateTwo(1, -1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateTwo(1, 1, -1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateTwo(1, Long.MAX_VALUE, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateTwo(1, 1, Long.MAX_VALUE)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateTwo(-1, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateTwo(1, -1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateTwo(1, 1, -1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateTwo(1, Long.MAX_VALUE, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateTwo(1, 1, Long.MAX_VALUE)); - assertEquals(3, subject.safeAccumulateTwo(1, 1, 1)); + assertEquals(3, SUBJECT.safeAccumulateTwo(1, 1, 1)); } @Test void safeAccumulateThreeWorks() { - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateThree(-1, 1, 1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateThree(1, -1, 1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateThree(1, 1, -1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateThree(1, 1, 1, -1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateThree(1, Long.MAX_VALUE, 1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateThree(1, 1, Long.MAX_VALUE, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateThree(1, 1, 1, Long.MAX_VALUE)); - - assertEquals(4, subject.safeAccumulateThree(1, 1, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateThree(-1, 1, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateThree(1, -1, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateThree(1, 1, -1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateThree(1, 1, 1, -1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateThree(1, Long.MAX_VALUE, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateThree(1, 1, Long.MAX_VALUE, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateThree(1, 1, 1, Long.MAX_VALUE)); + + assertEquals(4, SUBJECT.safeAccumulateThree(1, 1, 1, 1)); } @Test void safeAccumulateFourWorks() { - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateFour(-1, 1, 1, 1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateFour(1, -1, 1, 1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateFour(1, 1, -1, 1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateFour(1, 1, 1, -1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateFour(1, 1, 1, 1, -1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateFour(1, Long.MAX_VALUE, 1, 1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateFour(1, 1, Long.MAX_VALUE, 1, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateFour(1, 1, 1, Long.MAX_VALUE, 1)); - assertThrows(IllegalArgumentException.class, () -> subject.safeAccumulateFour(1, 1, 1, 1, Long.MAX_VALUE)); - - assertEquals(5, subject.safeAccumulateFour(1, 1, 1, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateFour(-1, 1, 1, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateFour(1, -1, 1, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateFour(1, 1, -1, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateFour(1, 1, 1, -1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateFour(1, 1, 1, 1, -1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateFour(1, Long.MAX_VALUE, 1, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateFour(1, 1, Long.MAX_VALUE, 1, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateFour(1, 1, 1, Long.MAX_VALUE, 1)); + assertThrows(IllegalArgumentException.class, () -> SUBJECT.safeAccumulateFour(1, 1, 1, 1, Long.MAX_VALUE)); + + assertEquals(5, SUBJECT.safeAccumulateFour(1, 1, 1, 1, 1)); } private static final FeeComponents mockFees = FeeComponents.newBuilder() @@ -112,25 +112,25 @@ void safeAccumulateFourWorks() { .setServicedata(mockFees) .build(); - private static final long one = 1; - private static final long bpt = 2; - private static final long vpt = 3; - private static final long rbh = 4; - private static final long sbh = 5; - private static final long bpr = 8; - private static final long sbpr = 9; - private static final long network_rbh = 10; - private static final FeeComponents mockUsageVector = FeeComponents.newBuilder() - .setConstant(one) - .setBpt(bpt) - .setVpt(vpt) - .setRbh(rbh) - .setSbh(sbh) - .setBpr(bpr) - .setSbpr(sbpr) + private static final long ONE = 1; + private static final long BPT = 2; + private static final long VPT = 3; + private static final long RBH = 4; + private static final long SBH = 5; + private static final long BPR = 8; + private static final long SBPR = 9; + private static final long NETWORK_RBH = 10; + private static final FeeComponents MOCK_USAGE_VECTOR = FeeComponents.newBuilder() + .setConstant(ONE) + .setBpt(BPT) + .setVpt(VPT) + .setRbh(RBH) + .setSbh(SBH) + .setBpr(BPR) + .setSbpr(SBPR) .build(); - private static final FeeData mockUsage = - ESTIMATOR_UTILS.withDefaultTxnPartitioning(mockUsageVector, SubType.DEFAULT, network_rbh, 3); + private static final FeeData MOCK_USAGE = + ESTIMATOR_UTILS.withDefaultTxnPartitioning(MOCK_USAGE_VECTOR, SubType.DEFAULT, NETWORK_RBH, 3); private static final void copyData(final FeeData feeData, final UsageAccumulator into) { into.setNumPayerKeys(feeData.getNodedata().getVpt()); diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculatorTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculatorTest.java index 8f3d5cb851f..3d02589fe9d 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculatorTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/fees/calculation/UsageBasedFeeCalculatorTest.java @@ -176,7 +176,7 @@ void invokesQueryDelegateByTypeAsExpected() { } @Test - void usesMultiplierAsExpected() throws Exception { + void usesMultiplierAsExpected() { // setup: final long multiplier = 1L; final FeeObject expectedFees = @@ -198,7 +198,7 @@ void usesMultiplierAsExpected() throws Exception { } @Test - void defaultFeeIfAccountMissing() throws Exception { + void defaultFeeIfAccountMissing() { // setup: correctOpEstimator = new TokenDissociateResourceUsage(mock(EstimatorFactory.class), mock(StoreImpl.class)); final FeeData expectedFeeData = FeeData.getDefaultInstance(); diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/hapi/fees/usage/TxnUsageEstimatorTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/hapi/fees/usage/TxnUsageEstimatorTest.java index df0bcfdbcd7..0885d455783 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/hapi/fees/usage/TxnUsageEstimatorTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/hapi/fees/usage/TxnUsageEstimatorTest.java @@ -43,7 +43,7 @@ class TxnUsageEstimatorTest { private TxnUsageEstimator subject; @BeforeEach - void setUp() throws Exception { + void setUp() { utils = mock(EstimatorUtils.class); subject = new TxnUsageEstimator(sigUsage, txn, utils); diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/state/submerkle/RichInstantTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/state/submerkle/RichInstantTest.java index bff6600e7d1..6f6d1b288bc 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/state/submerkle/RichInstantTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/state/submerkle/RichInstantTest.java @@ -34,14 +34,14 @@ import org.junit.jupiter.api.Test; class RichInstantTest { - private static final long seconds = 1_234_567L; - private static final int nanos = 890; + private static final long SECONDS = 1_234_567L; + private static final int NANOS = 890; private RichInstant subject; @BeforeEach void setup() { - subject = new RichInstant(seconds, nanos); + subject = new RichInstant(SECONDS, NANOS); } @Test @@ -51,15 +51,15 @@ void serializeWorks() throws IOException { subject.serialize(out); - inOrder.verify(out).writeLong(seconds); - inOrder.verify(out).writeInt(nanos); + inOrder.verify(out).writeLong(SECONDS); + inOrder.verify(out).writeInt(NANOS); } @Test void factoryWorks() throws IOException { final var in = mock(SerializableDataInputStream.class); - given(in.readLong()).willReturn(seconds); - given(in.readInt()).willReturn(nanos); + given(in.readLong()).willReturn(SECONDS); + given(in.readInt()).willReturn(NANOS); final var readSubject = from(in); @@ -74,7 +74,7 @@ void beanWorks() { @Test void viewWorks() { final var grpc = - Timestamp.newBuilder().setSeconds(seconds).setNanos(nanos).build(); + Timestamp.newBuilder().setSeconds(SECONDS).setNanos(NANOS).build(); assertEquals(grpc, subject.toGrpc()); } @@ -87,7 +87,7 @@ void knowsIfMissing() { @Test void toStringWorks() { - assertEquals("RichInstant{seconds=" + seconds + ", nanos=" + nanos + "}", subject.toString()); + assertEquals("RichInstant{seconds=" + SECONDS + ", nanos=" + NANOS + "}", subject.toString()); } @Test @@ -99,7 +99,7 @@ void factoryWorksForMissing() { @Test void objectContractWorks() { final var one = subject; - final var two = new RichInstant(seconds - 1, nanos - 1); + final var two = new RichInstant(SECONDS - 1, NANOS - 1); final var three = new RichInstant(subject.getSeconds(), subject.getNanos()); assertNotEquals(null, one); @@ -113,9 +113,9 @@ void objectContractWorks() { @Test void orderingWorks() { - assertTrue(subject.isAfter(new RichInstant(seconds - 1, nanos))); - assertTrue(subject.isAfter(new RichInstant(seconds, nanos - 1))); - assertFalse(subject.isAfter(new RichInstant(seconds, nanos + 1))); + assertTrue(subject.isAfter(new RichInstant(SECONDS - 1, NANOS))); + assertTrue(subject.isAfter(new RichInstant(SECONDS, NANOS - 1))); + assertFalse(subject.isAfter(new RichInstant(SECONDS, NANOS + 1))); } @Test diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/AssociatePrecompileTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/AssociatePrecompileTest.java index b4a7ae9dcbd..8da166cc7db 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/AssociatePrecompileTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/AssociatePrecompileTest.java @@ -329,8 +329,8 @@ void gasRequirementReturnsCorrectValueForAssociateToken() { .willAnswer(invocationOnMock -> invocationOnMock.getArgument(0)); final var builder = TokenAssociateTransactionBody.newBuilder(); - builder.setAccount(HTSTestsUtil.associateOp.accountId()); - builder.addAllTokens(HTSTestsUtil.associateOp.tokenIds()); + builder.setAccount(HTSTestsUtil.ASSOCIATE_OP.accountId()); + builder.addAllTokens(HTSTestsUtil.ASSOCIATE_OP.tokenIds()); given(feeCalculator.computeFee(any(), any(), any())) .willReturn(new FeeObject(TEST_NODE_FEE, TEST_NETWORK_FEE, TEST_SERVICE_FEE)); given(feeCalculator.estimatedGasPriceInTinybars(any(), any())).willReturn(HTSTestsUtil.DEFAULT_GAS_PRICE); diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/DeleteTokenPrecompileTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/DeleteTokenPrecompileTest.java index 599bd733f60..ca04ecca4e5 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/DeleteTokenPrecompileTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/DeleteTokenPrecompileTest.java @@ -18,9 +18,9 @@ import static com.hedera.mirror.web3.common.PrecompileContext.PRECOMPILE_CONTEXT; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.DEFAULT_GAS_PRICE; +import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.FUNGIBLE; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.TEST_CONSENSUS_TIME; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.contractAddress; -import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.fungible; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.sender; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.senderAddress; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.successResult; @@ -81,7 +81,7 @@ class DeleteTokenPrecompileTest { private static final long EXPECTED_GAS_PRICE = (TEST_SERVICE_FEE + TEST_NETWORK_FEE + TEST_NODE_FEE) / DEFAULT_GAS_PRICE * 6 / 5; private final TransactionBody.Builder transactionBody = TransactionBody.newBuilder() - .setTokenDeletion(TokenDeleteTransactionBody.newBuilder().setToken(fungible)); + .setTokenDeletion(TokenDeleteTransactionBody.newBuilder().setToken(FUNGIBLE)); @Mock private MessageFrame frame; diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/DissociatePrecompileTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/DissociatePrecompileTest.java index 54b81772bad..bf51c18fae7 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/DissociatePrecompileTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/DissociatePrecompileTest.java @@ -305,8 +305,8 @@ void gasRequirementReturnsCorrectValueForDissociateToken() { .willAnswer(invocationOnMock -> invocationOnMock.getArgument(0)); final var builder = TokenAssociateTransactionBody.newBuilder(); - builder.setAccount(HTSTestsUtil.dissociateOp.accountId()); - builder.addAllTokens(HTSTestsUtil.dissociateOp.tokenIds()); + builder.setAccount(HTSTestsUtil.DISSOCIATE_OP.accountId()); + builder.addAllTokens(HTSTestsUtil.DISSOCIATE_OP.tokenIds()); given(feeCalculator.computeFee(any(), any(), any())) .willReturn(new FeeObject(TEST_NODE_FEE, TEST_NETWORK_FEE, TEST_SERVICE_FEE)); given(feeCalculator.estimatedGasPriceInTinybars(any(), any())).willReturn(HTSTestsUtil.DEFAULT_GAS_PRICE); diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/FungibleTokenTransferTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/FungibleTokenTransferTest.java index e28aa09b35f..ee70b997f6f 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/FungibleTokenTransferTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/FungibleTokenTransferTest.java @@ -26,15 +26,15 @@ class FungibleTokenTransferTest { - static final long secondAmount = 200; - static final AccountID a = asAccount("0.0.2"); - static final AccountID b = asAccount("0.0.3"); - static final TokenID fungible = asToken("0.0.555"); - static final TokenID nonFungible = asToken("0.0.666"); + static final long SECOND_AMOUNT = 200; + static final AccountID A = asAccount("0.0.2"); + static final AccountID B = asAccount("0.0.3"); + static final TokenID FUNGIBLE = asToken("0.0.555"); + static final TokenID NON_FUNGIBLE = asToken("0.0.666"); @Test void createsExpectedCryptoTransfer() { - final var fungibleTransfer = new FungibleTokenTransfer(secondAmount, false, fungible, b, a); - assertEquals(fungible, fungibleTransfer.getDenomination()); + final var fungibleTransfer = new FungibleTokenTransfer(SECOND_AMOUNT, false, FUNGIBLE, B, A); + assertEquals(FUNGIBLE, fungibleTransfer.getDenomination()); } } diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/HTSTestsUtil.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/HTSTestsUtil.java index c441609d063..258a701d994 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/HTSTestsUtil.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/HTSTestsUtil.java @@ -105,32 +105,32 @@ public class HTSTestsUtil { UInt256.valueOf(ResponseCodeEnum.INVALID_FULL_PREFIX_SIGNATURE_FOR_PRECOMPILE_VALUE); public static final Bytes missingNftResult = UInt256.valueOf(ResponseCodeEnum.INVALID_TOKEN_NFT_SERIAL_NUMBER_VALUE); - public static final Long serialNumber = 1L; - public static final Association associateOp = Association.singleAssociation(accountMerkleId, tokenMerkleId); - public static final Dissociation dissociateOp = Dissociation.singleDissociation(accountMerkleId, tokenMerkleId); - public static final TokenID fungible = IdUtils.asToken("0.0.888"); - public static final Id nonFungibleId = Id.fromGrpcToken(nonFungible); - public static final Address nonFungibleTokenAddr = nonFungibleId.asEvmAddress(); - public static final Id fungibleId = Id.fromGrpcToken(fungible); + public static final Long SERIAL_NUMBER = 1L; + public static final Association ASSOCIATE_OP = Association.singleAssociation(accountMerkleId, tokenMerkleId); + public static final Dissociation DISSOCIATE_OP = Dissociation.singleDissociation(accountMerkleId, tokenMerkleId); + public static final TokenID FUNGIBLE = IdUtils.asToken("0.0.888"); + public static final Id NON_FUNGIBLE_ID = Id.fromGrpcToken(nonFungible); + public static final Address nonFungibleTokenAddr = NON_FUNGIBLE_ID.asEvmAddress(); + public static final Id fungibleId = Id.fromGrpcToken(FUNGIBLE); public static final Address fungibleTokenAddr = fungibleId.asEvmAddress(); public static final OwnerOfAndTokenURIWrapper ownerOfAndTokenUriWrapper = - new OwnerOfAndTokenURIWrapper(serialNumber); + new OwnerOfAndTokenURIWrapper(SERIAL_NUMBER); public static final GetTokenDefaultFreezeStatusWrapper defaultFreezeStatusWrapper = - new GetTokenDefaultFreezeStatusWrapper<>(fungible); + new GetTokenDefaultFreezeStatusWrapper<>(FUNGIBLE); public static final GetTokenDefaultKycStatusWrapper defaultKycStatusWrapper = - new GetTokenDefaultKycStatusWrapper<>(fungible); + new GetTokenDefaultKycStatusWrapper<>(FUNGIBLE); public static final GrantRevokeKycWrapper grantRevokeKycWrapper = - new GrantRevokeKycWrapper<>(fungible, account); + new GrantRevokeKycWrapper<>(FUNGIBLE, account); public static final TokenFreezeUnfreezeWrapper tokenFreezeUnFreezeWrapper = - new TokenFreezeUnfreezeWrapper<>(fungible, account); + new TokenFreezeUnfreezeWrapper<>(FUNGIBLE, account); public static final Address recipientAddress = Address.ALTBN128_ADD; public static final Address contractAddress = Address.ALTBN128_MUL; - public static final List targetSerialNos = List.of(1L, 2L, 3L); - public static final BurnWrapper nonFungibleBurn = BurnWrapper.forNonFungible(nonFungible, targetSerialNos); + public static final List TARGET_SERIAL_NOS = List.of(1L, 2L, 3L); + public static final BurnWrapper nonFungibleBurn = BurnWrapper.forNonFungible(nonFungible, TARGET_SERIAL_NOS); public static final Bytes burnSuccessResultWith49Supply = Bytes.fromHexString( "0x00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000031"); public static final Bytes burnSuccessResultWithLongMaxValueSupply = Bytes.fromHexString( @@ -139,21 +139,22 @@ public class HTSTestsUtil { public static final List newMetadata = List.of(ByteString.copyFromUtf8("AAA"), ByteString.copyFromUtf8("BBB"), ByteString.copyFromUtf8("CCC")); public static final MintWrapper nftMint = MintWrapper.forNonFungible(nonFungible, newMetadata); - public static final UnpauseWrapper fungibleUnpause = new UnpauseWrapper(fungible); - public static final WipeWrapper fungibleWipe = WipeWrapper.forFungible(fungible, account, AMOUNT); - public static final WipeWrapper nonFungibleWipe = WipeWrapper.forNonFungible(nonFungible, account, targetSerialNos); - public static final Bytes fungibleSuccessResultWith10Supply = Bytes.fromHexString( + public static final UnpauseWrapper fungibleUnpause = new UnpauseWrapper(FUNGIBLE); + public static final WipeWrapper fungibleWipe = WipeWrapper.forFungible(FUNGIBLE, account, AMOUNT); + public static final WipeWrapper nonFungibleWipe = + WipeWrapper.forNonFungible(nonFungible, account, TARGET_SERIAL_NOS); + public static final Bytes FUNGIBLE_SUCCESS_RESULT_WITH_10_SUPPLY = Bytes.fromHexString( "0x0000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000"); public static final Bytes fungibleSuccessResultWithLongMaxValueSupply = Bytes.fromHexString( "0x00000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000007fffffffffffffff00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000"); - public static final PauseWrapper fungiblePause = new PauseWrapper(fungible); + public static final PauseWrapper fungiblePause = new PauseWrapper(FUNGIBLE); public static final Bytes failInvalidResult = UInt256.valueOf(ResponseCodeEnum.FAIL_INVALID_VALUE); public static final Instant pendingChildConsTime = Instant.ofEpochSecond(1_234_567L, 890); public static final Address senderAddr = Address.ALTBN128_PAIRING; public static final String NOT_SUPPORTED_FUNGIBLE_OPERATION_REASON = "Invalid operation for ERC-20 token!"; public static final String NOT_SUPPORTED_NON_FUNGIBLE_OPERATION_REASON = "Invalid operation for ERC-721 token!"; - public static final MintWrapper fungibleMint = MintWrapper.forFungible(fungible, AMOUNT); - public static final WipeWrapper fungibleWipeMaxAmount = WipeWrapper.forFungible(fungible, account, Long.MAX_VALUE); + public static final MintWrapper fungibleMint = MintWrapper.forFungible(FUNGIBLE, AMOUNT); + public static final WipeWrapper fungibleWipeMaxAmount = WipeWrapper.forFungible(FUNGIBLE, account, Long.MAX_VALUE); public static final TokenGetCustomFeesWrapper customFeesWrapper = new TokenGetCustomFeesWrapper<>(token); public static final GetTokenExpiryInfoWrapper getTokenExpiryInfoWrapper = new GetTokenExpiryInfoWrapper<>(token); @@ -328,7 +329,7 @@ public static TokenInfoWrapper createTokenInfoWrapperForNonFungibleToke public static TokenUpdateWrapper createFungibleTokenUpdateWrapperWithKeys(final List keys) { return new TokenUpdateWrapper( - fungible, "fungible", "G", account, "G token memo", keys, new TokenExpiryWrapper(1L, account, 2L)); + FUNGIBLE, "fungible", "G", account, "G token memo", keys, new TokenExpiryWrapper(1L, account, 2L)); } public static TokenUpdateWrapper createNonFungibleTokenUpdateWrapperWithKeys(final List keys) { diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/HbarTransferTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/HbarTransferTest.java index 7c8d74f2cd6..b5f170d6f67 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/HbarTransferTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/HbarTransferTest.java @@ -16,9 +16,9 @@ package com.hedera.services.store.contracts.precompile; -import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.a; -import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.b; -import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.secondAmount; +import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.A; +import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.B; +import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.SECOND_AMOUNT; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; @@ -27,10 +27,10 @@ class HbarTransferTest { @Test void createsExpectedCryptoTransfer() { - final var hbarTransfer = new HbarTransfer(secondAmount, false, b, a); + final var hbarTransfer = new HbarTransfer(SECOND_AMOUNT, false, B, A); assertFalse(hbarTransfer.isApproval()); - assertEquals(b, hbarTransfer.sender()); - assertEquals(a, hbarTransfer.receiver()); + assertEquals(B, hbarTransfer.sender()); + assertEquals(A, hbarTransfer.receiver()); assertEquals(200, hbarTransfer.amount()); assertEquals(200, hbarTransfer.receiverAdjustment().getAmount()); assertEquals(-200, hbarTransfer.senderAdjustment().getAmount()); diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/MintPrecompileTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/MintPrecompileTest.java index a41b7253324..5744d79d14d 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/MintPrecompileTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/MintPrecompileTest.java @@ -18,9 +18,9 @@ import static com.hedera.mirror.web3.common.PrecompileContext.PRECOMPILE_CONTEXT; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.DEFAULT_GAS_PRICE; +import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.FUNGIBLE_SUCCESS_RESULT_WITH_10_SUPPLY; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.TEST_CONSENSUS_TIME; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.contractAddress; -import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.fungibleSuccessResultWith10Supply; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.fungibleSuccessResultWithLongMaxValueSupply; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.sender; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.senderAddress; @@ -287,7 +287,7 @@ void fungibleMintHappyPathWorks() { subject.getPrecompile(frame).getGasRequirement(TEST_CONSENSUS_TIME, transactionBody, sender); final var result = subject.computeInternal(frame); // then: - assertEquals(fungibleSuccessResultWith10Supply, result); + assertEquals(FUNGIBLE_SUCCESS_RESULT_WITH_10_SUPPLY, result); } @Test diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/NftExchangeTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/NftExchangeTest.java index db95f566fd1..28387efcdd9 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/NftExchangeTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/NftExchangeTest.java @@ -16,9 +16,9 @@ package com.hedera.services.store.contracts.precompile; -import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.a; -import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.b; -import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.nonFungible; +import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.A; +import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.B; +import static com.hedera.services.store.contracts.precompile.FungibleTokenTransferTest.NON_FUNGIBLE; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; @@ -27,11 +27,11 @@ class NftExchangeTest { @Test void createsExpectedCryptoTransfer() { - final var nftExchange = new NftExchange(1L, nonFungible, a, b); + final var nftExchange = new NftExchange(1L, NON_FUNGIBLE, A, B); assertFalse(nftExchange.isApproval()); - assertEquals(nonFungible, nftExchange.getTokenType()); + assertEquals(NON_FUNGIBLE, nftExchange.getTokenType()); assertTrue(nftExchange.asGrpc().hasSenderAccountID()); assertEquals(1L, nftExchange.getSerialNo()); - assertTrue(NftExchange.fromApproval(1L, nonFungible, a, b).isApproval()); + assertTrue(NftExchange.fromApproval(1L, NON_FUNGIBLE, A, B).isApproval()); } } diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/PausePrecompileTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/PausePrecompileTest.java index 2d99be0bf0d..ccf5be453ac 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/PausePrecompileTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/PausePrecompileTest.java @@ -142,7 +142,7 @@ class PausePrecompileTest { Bytes.fromHexString("0x7c41ad2c0000000000000000000000000000000000000000000000000000000000000445"); private final TransactionBody.Builder transactionBody = TransactionBody.newBuilder() - .setTokenPause(TokenPauseTransactionBody.newBuilder().setToken(fungible)); + .setTokenPause(TokenPauseTransactionBody.newBuilder().setToken(FUNGIBLE)); private HTSPrecompiledContract subject; private MockedStatic staticPausePrecompile; diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/SyntheticTxnFactoryTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/SyntheticTxnFactoryTest.java index 413b47b6f7b..3f73c9ef701 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/SyntheticTxnFactoryTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/SyntheticTxnFactoryTest.java @@ -66,7 +66,6 @@ import java.security.InvalidKeyException; import java.util.Collections; import java.util.List; -import org.apache.commons.codec.DecoderException; import org.apache.tuweni.bytes.Bytes; import org.bouncycastle.util.encoders.Hex; import org.hyperledger.besu.datatypes.Address; @@ -76,23 +75,23 @@ @ExtendWith(MockitoExtension.class) class SyntheticTxnFactoryTest { - private static final long serialNo = 100; - private static final long secondAmount = 200; - private static final AccountID a = IdUtils.asAccount("0.0.2"); - private static final AccountID b = IdUtils.asAccount("0.0.3"); - private static final AccountID c = IdUtils.asAccount("0.0.4"); - private static final TokenID fungible = IdUtils.asToken("0.0.555"); - private static final TokenID nonFungible = IdUtils.asToken("0.0.666"); - private static final List targetSerialNos = List.of(1L, 2L, 3L); - private static final List newMetadata = + private static final long SERIAL_NO = 100; + private static final long SECOND_AMOUNT = 200; + private static final AccountID ACCOUNT_A = IdUtils.asAccount("0.0.2"); + private static final AccountID ACCOUNT_B = IdUtils.asAccount("0.0.3"); + private static final AccountID ACCOUNT_C = IdUtils.asAccount("0.0.4"); + private static final TokenID FUNGIBLE = IdUtils.asToken("0.0.555"); + private static final TokenID NON_FUNGIBLE = IdUtils.asToken("0.0.666"); + private static final List TARGET_SERIAL_NOS = List.of(1L, 2L, 3L); + private static final List NEW_METADATA = List.of(ByteString.copyFromUtf8("AAA"), ByteString.copyFromUtf8("BBB"), ByteString.copyFromUtf8("CCC")); public static final String HTS_PRECOMPILED_CONTRACT_ADDRESS = "0x167"; - public static final TokenID token = IdUtils.asToken("0.0.1"); - public static final AccountID payer = IdUtils.asAccount("0.0.12345"); - public static final AccountID sender = IdUtils.asAccount("0.0.2"); + public static final TokenID TOKEN = IdUtils.asToken("0.0.1"); + public static final AccountID PAYER = IdUtils.asAccount("0.0.12345"); + public static final AccountID SENDER = IdUtils.asAccount("0.0.2"); - public static final AccountID receiver = IdUtils.asAccount("0.0.3"); - public static final Id senderId = Id.fromGrpcAccount(sender); + public static final AccountID RECEIVER = IdUtils.asAccount("0.0.3"); + public static final Id SENDER_ID = Id.fromGrpcAccount(SENDER); private SyntheticTxnFactory subject = new SyntheticTxnFactory(); @@ -120,7 +119,7 @@ void createsExpectedCryptoCreateWithEDKeyAlias() { } @Test - void createsExpectedCryptoCreateWithECKeyAlias() throws InvalidKeyException, DecoderException { + void createsExpectedCryptoCreateWithECKeyAlias() throws InvalidKeyException { final var balance = 10L; final var bytes = new byte[33]; bytes[0] = 0x02; @@ -189,126 +188,126 @@ void fungibleTokenChangeAddsAutoAssociations() { @Test void createsExpectedAssociations() { - final var tokens = List.of(fungible, nonFungible); - final var associations = multiAssociation(a, tokens); + final var tokens = List.of(FUNGIBLE, NON_FUNGIBLE); + final var associations = multiAssociation(ACCOUNT_A, tokens); final var result = subject.createAssociate(associations); final var txnBody = result.build(); - assertEquals(a, txnBody.getTokenAssociate().getAccount()); + assertEquals(ACCOUNT_A, txnBody.getTokenAssociate().getAccount()); assertEquals(tokens, txnBody.getTokenAssociate().getTokensList()); } @Test void createsExpectedDissociations() { - final var tokens = List.of(fungible, nonFungible); - final var associations = Dissociation.multiDissociation(a, tokens); + final var tokens = List.of(FUNGIBLE, NON_FUNGIBLE); + final var associations = Dissociation.multiDissociation(ACCOUNT_A, tokens); final var result = subject.createDissociate(associations); final var txnBody = result.build(); - assertEquals(a, txnBody.getTokenDissociate().getAccount()); + assertEquals(ACCOUNT_A, txnBody.getTokenDissociate().getAccount()); assertEquals(tokens, txnBody.getTokenDissociate().getTokensList()); } @Test void createsExpectedNftMint() { - final var nftMints = MintWrapper.forNonFungible(nonFungible, newMetadata); + final var nftMints = MintWrapper.forNonFungible(NON_FUNGIBLE, NEW_METADATA); final var result = subject.createMint(nftMints); final var txnBody = result.build(); - assertEquals(nonFungible, txnBody.getTokenMint().getToken()); - assertEquals(newMetadata, txnBody.getTokenMint().getMetadataList()); + assertEquals(NON_FUNGIBLE, txnBody.getTokenMint().getToken()); + assertEquals(NEW_METADATA, txnBody.getTokenMint().getMetadataList()); } @Test void createsExpectedNftBurn() { - final var nftBurns = BurnWrapper.forNonFungible(nonFungible, targetSerialNos); + final var nftBurns = BurnWrapper.forNonFungible(NON_FUNGIBLE, TARGET_SERIAL_NOS); final var result = subject.createBurn(nftBurns); final var txnBody = result.build(); - assertEquals(nonFungible, txnBody.getTokenBurn().getToken()); - assertEquals(targetSerialNos, txnBody.getTokenBurn().getSerialNumbersList()); + assertEquals(NON_FUNGIBLE, txnBody.getTokenBurn().getToken()); + assertEquals(TARGET_SERIAL_NOS, txnBody.getTokenBurn().getSerialNumbersList()); } @Test void createsExpectedFungibleMint() { final var amount = 1234L; - final var funMints = MintWrapper.forFungible(fungible, amount); + final var funMints = MintWrapper.forFungible(FUNGIBLE, amount); final var result = subject.createMint(funMints); final var txnBody = result.build(); - assertEquals(fungible, txnBody.getTokenMint().getToken()); + assertEquals(FUNGIBLE, txnBody.getTokenMint().getToken()); assertEquals(amount, txnBody.getTokenMint().getAmount()); } @Test void createsExpectedFungibleBurn() { final var amount = 1234L; - final var funBurns = BurnWrapper.forFungible(fungible, amount); + final var funBurns = BurnWrapper.forFungible(FUNGIBLE, amount); final var result = subject.createBurn(funBurns); final var txnBody = result.build(); - assertEquals(fungible, txnBody.getTokenBurn().getToken()); + assertEquals(FUNGIBLE, txnBody.getTokenBurn().getToken()); assertEquals(amount, txnBody.getTokenBurn().getAmount()); } @Test void createsExpectedGrantKycCall() { - final var grantWrapper = new GrantRevokeKycWrapper<>(fungible, a); + final var grantWrapper = new GrantRevokeKycWrapper<>(FUNGIBLE, ACCOUNT_A); final var result = subject.createGrantKyc(grantWrapper); final var txnBody = result.build(); - assertEquals(fungible, txnBody.getTokenGrantKyc().getToken()); - assertEquals(a, txnBody.getTokenGrantKyc().getAccount()); + assertEquals(FUNGIBLE, txnBody.getTokenGrantKyc().getToken()); + assertEquals(ACCOUNT_A, txnBody.getTokenGrantKyc().getAccount()); } @Test void createsExpectedFungibleWipe() { final var amount = 1234L; - final var fungibleWipe = WipeWrapper.forFungible(fungible, a, amount); + final var fungibleWipe = WipeWrapper.forFungible(FUNGIBLE, ACCOUNT_A, amount); final var result = subject.createWipe(fungibleWipe); final var txnBody = result.build(); - assertEquals(fungible, txnBody.getTokenWipe().getToken()); + assertEquals(FUNGIBLE, txnBody.getTokenWipe().getToken()); assertEquals(amount, txnBody.getTokenWipe().getAmount()); - assertEquals(a, txnBody.getTokenWipe().getAccount()); + assertEquals(ACCOUNT_A, txnBody.getTokenWipe().getAccount()); } @Test void createsExpectedFungibleApproveAllowance() { final var amount = BigInteger.ONE; - final var allowances = new ApproveWrapper(token, receiver, amount, BigInteger.ZERO, true, false); + final var allowances = new ApproveWrapper(TOKEN, RECEIVER, amount, BigInteger.ZERO, true, false); - final var result = subject.createFungibleApproval(allowances, senderId); + final var result = subject.createFungibleApproval(allowances, SENDER_ID); final var txnBody = result.build(); assertEquals( amount.longValue(), txnBody.getCryptoApproveAllowance().getTokenAllowances(0).getAmount()); assertEquals( - token, txnBody.getCryptoApproveAllowance().getTokenAllowances(0).getTokenId()); + TOKEN, txnBody.getCryptoApproveAllowance().getTokenAllowances(0).getTokenId()); final var allowance = txnBody.getCryptoApproveAllowance().getTokenAllowances(0); - assertEquals(senderId.asGrpcAccount(), allowance.getOwner()); - assertEquals(receiver, allowance.getSpender()); + assertEquals(SENDER_ID.asGrpcAccount(), allowance.getOwner()); + assertEquals(RECEIVER, allowance.getSpender()); } @Test void createsExpectedNonfungibleApproveAllowanceWithOwnerAsOperator() { - final var allowances = new ApproveWrapper(token, receiver, BigInteger.ZERO, BigInteger.ONE, false, false); + final var allowances = new ApproveWrapper(TOKEN, RECEIVER, BigInteger.ZERO, BigInteger.ONE, false, false); final var ownerId = new Id(0, 0, 666); final var result = subject.createNonfungibleApproval(allowances, ownerId, ownerId); final var txnBody = result.build(); final var allowance = txnBody.getCryptoApproveAllowance().getNftAllowances(0); - assertEquals(token, allowance.getTokenId()); - assertEquals(receiver, allowance.getSpender()); + assertEquals(TOKEN, allowance.getTokenId()); + assertEquals(RECEIVER, allowance.getSpender()); assertEquals(ownerId.asGrpcAccount(), allowance.getOwner()); assertEquals(AccountID.getDefaultInstance(), allowance.getDelegatingSpender()); assertEquals(1L, allowance.getSerialNumbers(0)); @@ -316,7 +315,7 @@ void createsExpectedNonfungibleApproveAllowanceWithOwnerAsOperator() { @Test void createsExpectedNonfungibleApproveAllowanceWithNonOwnerOperator() { - final var allowances = new ApproveWrapper(token, receiver, BigInteger.ZERO, BigInteger.ONE, false, false); + final var allowances = new ApproveWrapper(TOKEN, RECEIVER, BigInteger.ZERO, BigInteger.ONE, false, false); final var ownerId = new Id(0, 0, 666); final var operatorId = new Id(0, 0, 777); @@ -324,8 +323,8 @@ void createsExpectedNonfungibleApproveAllowanceWithNonOwnerOperator() { final var txnBody = result.build(); final var allowance = txnBody.getCryptoApproveAllowance().getNftAllowances(0); - assertEquals(token, allowance.getTokenId()); - assertEquals(receiver, allowance.getSpender()); + assertEquals(TOKEN, allowance.getTokenId()); + assertEquals(RECEIVER, allowance.getSpender()); assertEquals(ownerId.asGrpcAccount(), allowance.getOwner()); assertEquals(operatorId.asGrpcAccount(), allowance.getDelegatingSpender()); assertEquals(1L, allowance.getSerialNumbers(0)); @@ -333,28 +332,28 @@ void createsExpectedNonfungibleApproveAllowanceWithNonOwnerOperator() { @Test void createsExpectedNonfungibleApproveAllowanceWithoutOwner() { - final var allowances = new ApproveWrapper(token, receiver, BigInteger.ZERO, BigInteger.ONE, false, false); + final var allowances = new ApproveWrapper(TOKEN, RECEIVER, BigInteger.ZERO, BigInteger.ONE, false, false); final var operatorId = new Id(0, 0, 666); final var result = subject.createNonfungibleApproval(allowances, null, operatorId); final var txnBody = result.build(); final var allowance = txnBody.getCryptoApproveAllowance().getNftAllowances(0); - assertEquals(token, allowance.getTokenId()); - assertEquals(receiver, allowance.getSpender()); + assertEquals(TOKEN, allowance.getTokenId()); + assertEquals(RECEIVER, allowance.getSpender()); assertEquals(AccountID.getDefaultInstance(), allowance.getOwner()); assertEquals(1L, allowance.getSerialNumbers(0)); } @Test void createsDeleteAllowance() { - final var allowances = new ApproveWrapper(token, receiver, BigInteger.ZERO, BigInteger.ONE, false, false); + final var allowances = new ApproveWrapper(TOKEN, RECEIVER, BigInteger.ZERO, BigInteger.ONE, false, false); - final var result = subject.createDeleteAllowance(allowances, senderId); + final var result = subject.createDeleteAllowance(allowances, SENDER_ID); final var txnBody = result.build(); assertEquals( - token, txnBody.getCryptoDeleteAllowance().getNftAllowances(0).getTokenId()); + TOKEN, txnBody.getCryptoDeleteAllowance().getNftAllowances(0).getTokenId()); assertEquals(1L, txnBody.getCryptoDeleteAllowance().getNftAllowances(0).getSerialNumbers(0)); assertEquals( HTSTestsUtil.sender, @@ -363,30 +362,30 @@ void createsDeleteAllowance() { @Test void createsExpectedNftWipe() { - final var nftWipe = WipeWrapper.forNonFungible(nonFungible, a, targetSerialNos); + final var nftWipe = WipeWrapper.forNonFungible(NON_FUNGIBLE, ACCOUNT_A, TARGET_SERIAL_NOS); final var result = subject.createWipe(nftWipe); final var txnBody = result.build(); - assertEquals(nonFungible, txnBody.getTokenWipe().getToken()); - assertEquals(a, txnBody.getTokenWipe().getAccount()); - assertEquals(targetSerialNos, txnBody.getTokenWipe().getSerialNumbersList()); + assertEquals(NON_FUNGIBLE, txnBody.getTokenWipe().getToken()); + assertEquals(ACCOUNT_A, txnBody.getTokenWipe().getAccount()); + assertEquals(TARGET_SERIAL_NOS, txnBody.getTokenWipe().getSerialNumbersList()); } @Test void createsAdjustAllowanceForAllNFT() { - final var allowances = new SetApprovalForAllWrapper(nonFungible, receiver, true); + final var allowances = new SetApprovalForAllWrapper(NON_FUNGIBLE, RECEIVER, true); - final var result = subject.createApproveAllowanceForAllNFT(allowances, senderId); + final var result = subject.createApproveAllowanceForAllNFT(allowances, SENDER_ID); final var txnBody = result.build(); assertEquals( - receiver, + RECEIVER, txnBody.getCryptoApproveAllowance().getNftAllowances(0).getSpender()); assertEquals( - sender, txnBody.getCryptoApproveAllowance().getNftAllowances(0).getOwner()); + SENDER, txnBody.getCryptoApproveAllowance().getNftAllowances(0).getOwner()); assertEquals( - nonFungible, + NON_FUNGIBLE, txnBody.getCryptoApproveAllowance().getNftAllowances(0).getTokenId()); assertEquals( BoolValue.of(true), @@ -395,40 +394,40 @@ void createsAdjustAllowanceForAllNFT() { @Test void createsExpectedFreeze() { - final var freezeWrapper = TokenFreezeUnfreezeWrapper.forFreeze(fungible, a); + final var freezeWrapper = TokenFreezeUnfreezeWrapper.forFreeze(FUNGIBLE, ACCOUNT_A); final var result = subject.createFreeze(freezeWrapper); final var txnBody = result.build(); - assertEquals(fungible, txnBody.getTokenFreeze().getToken()); - assertEquals(a, txnBody.getTokenFreeze().getAccount()); + assertEquals(FUNGIBLE, txnBody.getTokenFreeze().getToken()); + assertEquals(ACCOUNT_A, txnBody.getTokenFreeze().getAccount()); } @Test void createsExpectedUnfreeze() { - final var unfreezeWrapper = TokenFreezeUnfreezeWrapper.forUnfreeze(fungible, a); + final var unfreezeWrapper = TokenFreezeUnfreezeWrapper.forUnfreeze(FUNGIBLE, ACCOUNT_A); final var result = subject.createUnfreeze(unfreezeWrapper); final var txnBody = result.build(); - assertEquals(fungible, txnBody.getTokenUnfreeze().getToken()); - assertEquals(a, txnBody.getTokenUnfreeze().getAccount()); + assertEquals(FUNGIBLE, txnBody.getTokenUnfreeze().getToken()); + assertEquals(ACCOUNT_A, txnBody.getTokenUnfreeze().getAccount()); } @Test void createsExpectedPause() { - final var pauseWrapper = new PauseWrapper(fungible); + final var pauseWrapper = new PauseWrapper(FUNGIBLE); final var result = subject.createPause(pauseWrapper); final var txnBody = result.build(); - assertEquals(fungible, txnBody.getTokenPause().getToken()); + assertEquals(FUNGIBLE, txnBody.getTokenPause().getToken()); } @Test void createsExpectedUnpause() { - final var unpauseWrapper = new UnpauseWrapper(fungible); + final var unpauseWrapper = new UnpauseWrapper(FUNGIBLE); final var result = subject.createUnpause(unpauseWrapper); final var txnBody = result.build(); - assertEquals(fungible, txnBody.getTokenUnpause().getToken()); + assertEquals(FUNGIBLE, txnBody.getTokenUnpause().getToken()); } @Test @@ -449,7 +448,7 @@ void createsExpectedTransactionCall() { @Test void createsExpectedCryptoTransfer() { - final var fungibleTransfer = new FungibleTokenTransfer(secondAmount, false, fungible, b, a); + final var fungibleTransfer = new FungibleTokenTransfer(SECOND_AMOUNT, false, FUNGIBLE, ACCOUNT_B, ACCOUNT_A); final var result = subject.createCryptoTransfer( List.of(new TokenTransferWrapper(Collections.emptyList(), List.of(fungibleTransfer)))); @@ -457,7 +456,7 @@ void createsExpectedCryptoTransfer() { final var tokenTransfers = txnBody.getCryptoTransfer().getTokenTransfersList(); final var expFungibleTransfer = tokenTransfers.get(0); - assertEquals(fungible, expFungibleTransfer.getToken()); + assertEquals(FUNGIBLE, expFungibleTransfer.getToken()); assertEquals( List.of(fungibleTransfer.senderAdjustment(), fungibleTransfer.receiverAdjustment()), expFungibleTransfer.getTransfersList()); @@ -465,8 +464,8 @@ void createsExpectedCryptoTransfer() { @Test void mergesRepeatedTokenIds() { - final var fungibleTransfer = new FungibleTokenTransfer(secondAmount, false, fungible, b, a); - final var nonFungibleTransfer = new NftExchange(1L, nonFungible, a, b); + final var fungibleTransfer = new FungibleTokenTransfer(SECOND_AMOUNT, false, FUNGIBLE, ACCOUNT_B, ACCOUNT_A); + final var nonFungibleTransfer = new NftExchange(1L, NON_FUNGIBLE, ACCOUNT_A, ACCOUNT_B); assertFalse(nonFungibleTransfer.isApproval()); final var result = subject.createCryptoTransfer(List.of( @@ -479,14 +478,15 @@ void mergesRepeatedTokenIds() { final var finalTransfers = txnBody.getCryptoTransfer().getTokenTransfersList(); assertEquals(2, finalTransfers.size()); final var mergedFungible = finalTransfers.get(0); - assertEquals(fungible, mergedFungible.getToken()); + assertEquals(FUNGIBLE, mergedFungible.getToken()); assertEquals( - List.of(aaWith(b, -2 * secondAmount), aaWith(a, +2 * secondAmount)), mergedFungible.getTransfersList()); + List.of(aaWith(ACCOUNT_B, -2 * SECOND_AMOUNT), aaWith(ACCOUNT_A, +2 * SECOND_AMOUNT)), + mergedFungible.getTransfersList()); } @Test void createsExpectedCryptoTransferForNFTTransfer() { - final var nftExchange = new NftExchange(serialNo, nonFungible, a, c); + final var nftExchange = new NftExchange(SERIAL_NO, NON_FUNGIBLE, ACCOUNT_A, ACCOUNT_C); final var result = subject.createCryptoTransfer( Collections.singletonList(new TokenTransferWrapper(List.of(nftExchange), Collections.emptyList()))); @@ -494,14 +494,14 @@ void createsExpectedCryptoTransferForNFTTransfer() { final var tokenTransfers = txnBody.getCryptoTransfer().getTokenTransfersList(); final var expNftTransfer = tokenTransfers.get(0); - assertEquals(nonFungible, expNftTransfer.getToken()); + assertEquals(NON_FUNGIBLE, expNftTransfer.getToken()); assertEquals(List.of(nftExchange.asGrpc()), expNftTransfer.getNftTransfersList()); assertEquals(1, tokenTransfers.size()); } @Test void createsExpectedCryptoTransferForFungibleTransfer() { - final var fungibleTransfer = new FungibleTokenTransfer(secondAmount, false, fungible, b, a); + final var fungibleTransfer = new FungibleTokenTransfer(SECOND_AMOUNT, false, FUNGIBLE, ACCOUNT_B, ACCOUNT_A); final var result = subject.createCryptoTransfer(Collections.singletonList( new TokenTransferWrapper(Collections.emptyList(), List.of(fungibleTransfer)))); @@ -509,7 +509,7 @@ void createsExpectedCryptoTransferForFungibleTransfer() { final var tokenTransfers = txnBody.getCryptoTransfer().getTokenTransfersList(); final var expFungibleTransfer = tokenTransfers.get(0); - assertEquals(fungible, expFungibleTransfer.getToken()); + assertEquals(FUNGIBLE, expFungibleTransfer.getToken()); assertEquals( List.of(fungibleTransfer.senderAdjustment(), fungibleTransfer.receiverAdjustment()), expFungibleTransfer.getTransfersList()); @@ -518,8 +518,8 @@ void createsExpectedCryptoTransferForFungibleTransfer() { @Test void createsExpectedCryptoTransfersForMultipleTransferWrappers() { - final var nftExchange = new NftExchange(serialNo, nonFungible, a, c); - final var fungibleTransfer = new FungibleTokenTransfer(secondAmount, false, fungible, b, a); + final var nftExchange = new NftExchange(SERIAL_NO, NON_FUNGIBLE, ACCOUNT_A, ACCOUNT_C); + final var fungibleTransfer = new FungibleTokenTransfer(SECOND_AMOUNT, false, FUNGIBLE, ACCOUNT_B, ACCOUNT_A); final var result = subject.createCryptoTransfer(List.of( new TokenTransferWrapper(Collections.emptyList(), List.of(fungibleTransfer)), @@ -529,37 +529,39 @@ void createsExpectedCryptoTransfersForMultipleTransferWrappers() { final var tokenTransfers = txnBody.getCryptoTransfer().getTokenTransfersList(); final var expFungibleTransfer = tokenTransfers.get(0); - assertEquals(fungible, expFungibleTransfer.getToken()); + assertEquals(FUNGIBLE, expFungibleTransfer.getToken()); assertEquals( List.of(fungibleTransfer.senderAdjustment(), fungibleTransfer.receiverAdjustment()), expFungibleTransfer.getTransfersList()); final var expNftTransfer = tokenTransfers.get(1); - assertEquals(nonFungible, expNftTransfer.getToken()); + assertEquals(NON_FUNGIBLE, expNftTransfer.getToken()); assertEquals(List.of(nftExchange.asGrpc()), expNftTransfer.getNftTransfersList()); } @Test void mergesFungibleTransfersAsExpected() { final var source = new TokenTransferWrapper( - Collections.emptyList(), List.of(new FungibleTokenTransfer(1, false, fungible, a, b))) + Collections.emptyList(), + List.of(new FungibleTokenTransfer(1, false, FUNGIBLE, ACCOUNT_A, ACCOUNT_B))) .asGrpcBuilder(); final var target = new TokenTransferWrapper( - Collections.emptyList(), List.of(new FungibleTokenTransfer(2, false, fungible, b, c))) + Collections.emptyList(), + List.of(new FungibleTokenTransfer(2, false, FUNGIBLE, ACCOUNT_B, ACCOUNT_C))) .asGrpcBuilder(); SyntheticTxnFactory.mergeTokenTransfers(target, source); - assertEquals(fungible, target.getToken()); + assertEquals(FUNGIBLE, target.getToken()); final var transfers = target.getTransfersList(); - assertEquals(List.of(aaWith(b, -1), aaWith(c, +2), aaWith(a, -1)), transfers); + assertEquals(List.of(aaWith(ACCOUNT_B, -1), aaWith(ACCOUNT_C, +2), aaWith(ACCOUNT_A, -1)), transfers); } @Test void createsExpectedCryptoTransferForFungibleAndHbarTransfer() { - final var fungibleTransfer = new FungibleTokenTransfer(secondAmount, false, fungible, b, a); + final var fungibleTransfer = new FungibleTokenTransfer(SECOND_AMOUNT, false, FUNGIBLE, ACCOUNT_B, ACCOUNT_A); - final var hbarTransfer = new HbarTransfer(secondAmount, false, a, b); + final var hbarTransfer = new HbarTransfer(SECOND_AMOUNT, false, ACCOUNT_A, ACCOUNT_B); final var result = subject.createCryptoTransfer(Collections.singletonList( new TokenTransferWrapper(Collections.emptyList(), List.of(fungibleTransfer)))); @@ -571,7 +573,7 @@ void createsExpectedCryptoTransferForFungibleAndHbarTransfer() { final var tokenTransfers = txnBody.getCryptoTransfer().getTokenTransfersList(); final var expFungibleTransfer = tokenTransfers.get(0); - assertEquals(fungible, expFungibleTransfer.getToken()); + assertEquals(FUNGIBLE, expFungibleTransfer.getToken()); assertEquals( List.of(fungibleTransfer.senderAdjustment(), fungibleTransfer.receiverAdjustment()), expFungibleTransfer.getTransfersList()); @@ -587,8 +589,8 @@ void createsExpectedCryptoTransferForFungibleAndHbarTransfer() { @Test void createsExpectedCryptoTransferForNFTAndHbarTransfer() { - final var nftExchange = new NftExchange(serialNo, nonFungible, a, c); - final var hbarTransfer = new HbarTransfer(secondAmount, false, a, b); + final var nftExchange = new NftExchange(SERIAL_NO, NON_FUNGIBLE, ACCOUNT_A, ACCOUNT_C); + final var hbarTransfer = new HbarTransfer(SECOND_AMOUNT, false, ACCOUNT_A, ACCOUNT_B); final var result = subject.createCryptoTransfer( Collections.singletonList(new TokenTransferWrapper(List.of(nftExchange), Collections.emptyList()))); @@ -600,7 +602,7 @@ void createsExpectedCryptoTransferForNFTAndHbarTransfer() { final var tokenTransfers = txnBody.getCryptoTransfer().getTokenTransfersList(); final var expNftTransfer = tokenTransfers.get(0); - assertEquals(nonFungible, expNftTransfer.getToken()); + assertEquals(NON_FUNGIBLE, expNftTransfer.getToken()); assertEquals(List.of(nftExchange.asGrpc()), expNftTransfer.getNftTransfersList()); assertEquals(1, tokenTransfers.size()); @@ -614,7 +616,7 @@ void createsExpectedCryptoTransferForNFTAndHbarTransfer() { @Test void createsExpectedCryptoTransferHbarOnlyTransfer() { - final var hbarTransfer = new HbarTransfer(secondAmount, false, a, b); + final var hbarTransfer = new HbarTransfer(SECOND_AMOUNT, false, ACCOUNT_A, ACCOUNT_B); final var result = subject.createCryptoTransfer(Collections.emptyList()); final var resultHBar = subject.createCryptoTransferForHbar(new TransferWrapper(List.of(hbarTransfer))); @@ -636,8 +638,8 @@ void createsExpectedCryptoTransferHbarOnlyTransfer() { @Test void createsExpectedCryptoTransferTokensOnlyTransfer() { - final var nftExchange = new NftExchange(serialNo, nonFungible, a, c); - final var fungibleTransfer = new FungibleTokenTransfer(secondAmount, false, fungible, b, a); + final var nftExchange = new NftExchange(SERIAL_NO, NON_FUNGIBLE, ACCOUNT_A, ACCOUNT_C); + final var fungibleTransfer = new FungibleTokenTransfer(SECOND_AMOUNT, false, FUNGIBLE, ACCOUNT_B, ACCOUNT_A); final var result = subject.createCryptoTransfer(List.of( new TokenTransferWrapper(Collections.emptyList(), List.of(fungibleTransfer)), @@ -650,13 +652,13 @@ void createsExpectedCryptoTransferTokensOnlyTransfer() { final var tokenTransfers = txnBody.getCryptoTransfer().getTokenTransfersList(); final var expFungibleTransfer = tokenTransfers.get(0); - assertEquals(fungible, expFungibleTransfer.getToken()); + assertEquals(FUNGIBLE, expFungibleTransfer.getToken()); assertEquals( List.of(fungibleTransfer.senderAdjustment(), fungibleTransfer.receiverAdjustment()), expFungibleTransfer.getTransfersList()); final var expNftTransfer = tokenTransfers.get(1); - assertEquals(nonFungible, expNftTransfer.getToken()); + assertEquals(NON_FUNGIBLE, expNftTransfer.getToken()); assertEquals(List.of(nftExchange.asGrpc()), expNftTransfer.getNftTransfersList()); final var hbarTransfers = txnBody.getCryptoTransfer().getTransfers(); @@ -684,7 +686,7 @@ void createsExpectedTokenUpdateCallForFungible() { final var result = subject.createTokenUpdate(tokenUpdateWrapper); final var txnBody = result.build().getTokenUpdate(); - assertEquals(HTSTestsUtil.fungible, txnBody.getToken()); + assertEquals(HTSTestsUtil.FUNGIBLE, txnBody.getToken()); assertEquals("fungible", txnBody.getName()); assertEquals("G", txnBody.getSymbol()); @@ -698,15 +700,15 @@ void createsExpectedTokenUpdateCallForFungible() { @Test void createsExpectedTokenUpdateCallForNonFungible() { // given - final var ComplexKey = new KeyValueWrapper( + final var complexKey = new KeyValueWrapper( false, null, new byte[] {}, new byte[] {}, contractIdFromEvmAddress(contractAddress)); final var multiKey = new KeyValueWrapper( false, contractIdFromEvmAddress(contractAddress), new byte[] {}, new byte[] {}, null); final var wrapper = createNonFungibleTokenUpdateWrapperWithKeys(List.of( new TokenKeyWrapper(112, multiKey), - new TokenKeyWrapper(2, ComplexKey), - new TokenKeyWrapper(4, ComplexKey), - new TokenKeyWrapper(8, ComplexKey))); + new TokenKeyWrapper(2, complexKey), + new TokenKeyWrapper(4, complexKey), + new TokenKeyWrapper(8, complexKey))); // when final var result = subject.createTokenUpdate(wrapper); @@ -721,38 +723,38 @@ void createsExpectedTokenUpdateCallForNonFungible() { @Test void createsExpectedUpdateTokenExpiryInfoWithZeroExpiry() { - final var updateExpiryInfo = new TokenUpdateExpiryInfoWrapper(token, new TokenExpiryWrapper(0L, payer, 555L)); + final var updateExpiryInfo = new TokenUpdateExpiryInfoWrapper(TOKEN, new TokenExpiryWrapper(0L, PAYER, 555L)); final var result = subject.createTokenUpdateExpiryInfo(updateExpiryInfo); final var txnBody = result.build(); - assertEquals(token, txnBody.getTokenUpdate().getToken()); + assertEquals(TOKEN, txnBody.getTokenUpdate().getToken()); assertEquals(0L, txnBody.getTokenUpdate().getExpiry().getSeconds()); - assertEquals(payer, txnBody.getTokenUpdate().getAutoRenewAccount()); + assertEquals(PAYER, txnBody.getTokenUpdate().getAutoRenewAccount()); assertEquals(555L, txnBody.getTokenUpdate().getAutoRenewPeriod().getSeconds()); } @Test void createsExpectedUpdateTokenExpiryInfoWithZeroAutoRenewPeriod() { - final var updateExpiryInfo = new TokenUpdateExpiryInfoWrapper(token, new TokenExpiryWrapper(442L, payer, 0L)); + final var updateExpiryInfo = new TokenUpdateExpiryInfoWrapper(TOKEN, new TokenExpiryWrapper(442L, PAYER, 0L)); final var result = subject.createTokenUpdateExpiryInfo(updateExpiryInfo); final var txnBody = result.build(); - assertEquals(token, txnBody.getTokenUpdate().getToken()); + assertEquals(TOKEN, txnBody.getTokenUpdate().getToken()); assertEquals(442L, txnBody.getTokenUpdate().getExpiry().getSeconds()); - assertEquals(payer, txnBody.getTokenUpdate().getAutoRenewAccount()); + assertEquals(PAYER, txnBody.getTokenUpdate().getAutoRenewAccount()); assertEquals(0L, txnBody.getTokenUpdate().getAutoRenewPeriod().getSeconds()); } @Test void createsExpectedUpdateTokenExpiryInfoWithNoAutoRenewAccount() { - final var updateExpiryInfo = new TokenUpdateExpiryInfoWrapper(token, new TokenExpiryWrapper(442L, null, 555L)); + final var updateExpiryInfo = new TokenUpdateExpiryInfoWrapper(TOKEN, new TokenExpiryWrapper(442L, null, 555L)); final var result = subject.createTokenUpdateExpiryInfo(updateExpiryInfo); final var txnBody = result.build(); - assertEquals(token, txnBody.getTokenUpdate().getToken()); + assertEquals(TOKEN, txnBody.getTokenUpdate().getToken()); assertEquals(442L, txnBody.getTokenUpdate().getExpiry().getSeconds()); assertTrue(txnBody.getTokenUpdate().getAutoRenewAccount().toString().isEmpty()); assertEquals(555L, txnBody.getTokenUpdate().getAutoRenewPeriod().getSeconds()); @@ -789,7 +791,7 @@ void createsExpectedFungibleTokenCreate() { assertFalse(txnBody.getFreezeDefault()); assertEquals(442L, txnBody.getExpiry().getSeconds()); assertEquals(555L, txnBody.getAutoRenewPeriod().getSeconds()); - assertEquals(payer, txnBody.getAutoRenewAccount()); + assertEquals(PAYER, txnBody.getAutoRenewAccount()); // keys assertions assertKeys(txnBody, adminKey, multiKey); diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/TokenUpdateKeysPrecompileTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/TokenUpdateKeysPrecompileTest.java index c1e7f07008b..0a8e1523404 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/TokenUpdateKeysPrecompileTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/TokenUpdateKeysPrecompileTest.java @@ -17,9 +17,9 @@ package com.hedera.services.store.contracts.precompile; import static com.hedera.mirror.web3.common.PrecompileContext.PRECOMPILE_CONTEXT; +import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.FUNGIBLE; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.contractAddress; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.failResult; -import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.fungible; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.sender; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.senderAddress; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.successResult; @@ -288,6 +288,6 @@ private TokenUpdateKeysWrapper getUpdateWrapper() { final var multiKey = new KeyValueWrapper( false, EntityIdUtils.contractIdFromEvmAddress(contractAddress), new byte[] {}, new byte[] {}, null); return new TokenUpdateKeysWrapper( - fungible, List.of(new TokenKeyWrapper(112, multiKey), new TokenKeyWrapper(1, adminKey))); + FUNGIBLE, List.of(new TokenKeyWrapper(112, multiKey), new TokenKeyWrapper(1, adminKey))); } } diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/TransferPrecompileTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/TransferPrecompileTest.java index 5ec3e1e6dba..dbe3eb52e12 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/TransferPrecompileTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/TransferPrecompileTest.java @@ -17,6 +17,7 @@ package com.hedera.services.store.contracts.precompile; import static com.hedera.mirror.web3.common.PrecompileContext.PRECOMPILE_CONTEXT; +import static com.hedera.services.hapi.utils.ByteStringUtils.wrapUnsafely; import static com.hedera.services.store.contracts.precompile.AbiConstants.ABI_ID_CRYPTO_TRANSFER; import static com.hedera.services.store.contracts.precompile.AbiConstants.ABI_ID_CRYPTO_TRANSFER_V2; import static com.hedera.services.store.contracts.precompile.AbiConstants.ABI_ID_TRANSFER_NFTS; @@ -43,7 +44,6 @@ import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.sender; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.successResult; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.timestamp; -import static com.hedera.services.store.contracts.precompile.codec.DecodingFacade.wrapUnsafely; import static com.hedera.services.store.contracts.precompile.impl.TransferPrecompile.addNftExchanges; import static com.hedera.services.store.contracts.precompile.impl.TransferPrecompile.addSignedAdjustments; import static com.hedera.services.store.contracts.precompile.impl.TransferPrecompile.decodeCryptoTransfer; diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/UnpausePrecompileTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/UnpausePrecompileTest.java index 6dc74a1acf1..ac7ffffe530 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/UnpausePrecompileTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/UnpausePrecompileTest.java @@ -143,7 +143,7 @@ class UnpausePrecompileTest { Bytes.fromHexString("0x3b3bff0f0000000000000000000000000000000000000000000000000000000000000449"); private final TransactionBody.Builder transactionBody = TransactionBody.newBuilder() - .setTokenUnpause(TokenUnpauseTransactionBody.newBuilder().setToken(fungible)); + .setTokenUnpause(TokenUnpauseTransactionBody.newBuilder().setToken(FUNGIBLE)); private HTSPrecompiledContract subject; private MockedStatic staticUnpausePrecompile; diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/WipeFungiblePrecompileTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/WipeFungiblePrecompileTest.java index 1f118c430e9..e47dd5b2eb8 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/WipeFungiblePrecompileTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/WipeFungiblePrecompileTest.java @@ -18,9 +18,9 @@ import static com.hedera.mirror.web3.common.PrecompileContext.PRECOMPILE_CONTEXT; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.DEFAULT_GAS_PRICE; +import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.FUNGIBLE; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.TEST_CONSENSUS_TIME; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.contractAddress; -import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.fungible; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.sender; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.senderAddress; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.successResult; @@ -92,7 +92,7 @@ class WipeFungiblePrecompileTest { "0xefef57f900000000000000000000000000000000000000000000000000000000000006aa00000000000000000000000000000000000000000000000000000000000006a8000000000000000000000000000000000000000000000000000000000000000a"); private final TransactionBody.Builder transactionBody = TransactionBody.newBuilder() .setTokenWipe(TokenWipeAccountTransactionBody.newBuilder() - .setToken(fungible) + .setToken(FUNGIBLE) .setAccount(HTSTestsUtil.contract)); @Mock diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/WipeNonFungiblePrecompileTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/WipeNonFungiblePrecompileTest.java index 9869b0a0af0..8dc66399396 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/WipeNonFungiblePrecompileTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/store/contracts/precompile/WipeNonFungiblePrecompileTest.java @@ -17,7 +17,6 @@ package com.hedera.services.store.contracts.precompile; import static com.hedera.mirror.web3.common.PrecompileContext.PRECOMPILE_CONTEXT; -import static com.hedera.services.store.contracts.precompile.AbiConstants.ABI_WIPE_TOKEN_ACCOUNT_NFT; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.DEFAULT_GAS_PRICE; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.TEST_CONSENSUS_TIME; import static com.hedera.services.store.contracts.precompile.HTSTestsUtil.contractAddress; @@ -34,7 +33,6 @@ import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.BDDMockito.given; -import com.esaulpaugh.headlong.util.Integers; import com.hedera.mirror.web3.common.PrecompileContext; import com.hedera.mirror.web3.evm.properties.MirrorNodeEvmProperties; import com.hedera.mirror.web3.evm.store.Store; @@ -209,7 +207,6 @@ void gasRequirementReturnsCorrectValueForWipeNonFungibleToken() { givenMinFrameContext(); givenPricingUtilsContext(); given(frame.getWorldUpdater()).willReturn(worldUpdater); - final Bytes input = Bytes.of(Integers.toBytes(ABI_WIPE_TOKEN_ACCOUNT_NFT)); given(worldUpdater.permissivelyUnaliased(any())) .willAnswer(invocationOnMock -> invocationOnMock.getArgument(0)); given(feeCalculator.computeFee(any(), any(), any())) diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/txn/token/BurnLogicTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/txn/token/BurnLogicTest.java index 84abdfecc33..5d2d3955d63 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/txn/token/BurnLogicTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/txn/token/BurnLogicTest.java @@ -28,11 +28,9 @@ import com.hedera.node.app.service.evm.store.tokens.TokenType; import com.hedera.services.store.models.Account; import com.hedera.services.store.models.Id; -import com.hedera.services.store.models.NftId; import com.hedera.services.store.models.Token; import com.hedera.services.store.models.TokenModificationResult; import com.hedera.services.store.models.TokenRelationship; -import com.hedera.services.store.models.UniqueToken; import com.hedera.services.txns.validation.OptionValidator; import com.hederahashgraph.api.proto.java.TokenBurnTransactionBody; import com.hederahashgraph.api.proto.java.TokenID; @@ -72,9 +70,6 @@ class BurnLogicTest { @Mock private TokenRelationship modifiedTreasuryRel; - @Mock - private UniqueToken uniqueToken; - @Mock private Token tokenAfterBurn; @@ -120,8 +115,6 @@ void followsHappyPathForCommon() { void followsHappyPathForUnique() { // setup: final var serials = List.of(1L, 2L); - final var firstNftId = new NftId(id.shard(), id.realm(), id.num(), 1); - final var secondNftId = new NftId(id.shard(), id.realm(), id.num(), 2); treasuryRel = new TokenRelationship(token, treasury); givenValidUniqueTxnCtx(); diff --git a/hedera-mirror-web3/src/test/java/com/hedera/services/utils/accessors/SignedTxnAccessorTest.java b/hedera-mirror-web3/src/test/java/com/hedera/services/utils/accessors/SignedTxnAccessorTest.java index d62ac39acfb..57a7ce0bea0 100644 --- a/hedera-mirror-web3/src/test/java/com/hedera/services/utils/accessors/SignedTxnAccessorTest.java +++ b/hedera-mirror-web3/src/test/java/com/hedera/services/utils/accessors/SignedTxnAccessorTest.java @@ -129,10 +129,6 @@ void uncheckedPropagatesIaeOnNonsense() { @Test void parsesLegacyCorrectly() throws Exception { - final Key aPrimitiveKey = Key.newBuilder() - .setEd25519(ByteString.copyFromUtf8("01234567890123456789012345678901")) - .build(); - final ByteString aNewAlias = aPrimitiveKey.toByteString(); final MirrorEvmContractAliases aliasManager = mock(MirrorEvmContractAliases.class); given(aliasManager.resolveForEvm(any())).willReturn(Address.ZERO); @@ -154,44 +150,6 @@ void parsesLegacyCorrectly() throws Exception { 5679l, 70000l); xferNoAliases = xferNoAliases.toBuilder().setSigMap(EXPECTED_MAP).build(); - var xferWithAutoCreation = RequestBuilderUtils.getHbarCryptoTransferRequestToAlias( - 1234l, - 0l, - 0l, - 3l, - 0l, - 0l, - offeredFee, - Timestamp.getDefaultInstance(), - Duration.getDefaultInstance(), - false, - ZERO_BYTE_MEMO, - 5678l, - -70000l, - aNewAlias, - 70000l); - xferWithAutoCreation = - xferWithAutoCreation.toBuilder().setSigMap(EXPECTED_MAP).build(); - var xferWithAliasesNoAutoCreation = RequestBuilderUtils.getTokenTransferRequestToAlias( - 1234l, - 0l, - 0l, - 3l, - 0l, - 0l, - offeredFee, - Timestamp.getDefaultInstance(), - Duration.getDefaultInstance(), - false, - ZERO_BYTE_MEMO, - 5678l, - 5555l, - -70000l, - ByteString.copyFromUtf8("aaaa"), - 70000l); - xferWithAliasesNoAutoCreation = xferWithAliasesNoAutoCreation.toBuilder() - .setSigMap(EXPECTED_MAP) - .build(); final var body = TransactionBody.parseFrom(extractTransactionBodyByteString(xferNoAliases)); final var signedTransaction = TxnUtils.signedTransactionFrom(body, EXPECTED_MAP);