From e563eece29450a7915b1eac286f501a45b86865b Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 19:09:18 +0200 Subject: [PATCH 01/16] refactor pom --- pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 55cb609c..f522f8aa 100644 --- a/pom.xml +++ b/pom.xml @@ -4,17 +4,17 @@ 4.0.0 net.helix - helix + pendulum 0.6.3 - Helix - Helix Protocol + Pendulum + Pendulum Protocol - https://github.com/helixnetwork/helix-1.0/ - scm:git:git://github.com/helixnetwork/helix-1.0.git - scm:git:git@github.com/helixnetwork/helix-1.0.git + https://github.com/helixnetwork/pendulum/ + scm:git:git://github.com/helixnetwork/pendulum.git + scm:git:git@github.com/helixnetwork/pendulum.git From 82fdfc866fa294d5fd2d07031ce6f67943131767 Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 19:15:30 +0200 Subject: [PATCH 02/16] refactor and modify readme --- README.md | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index d7eb8874..d98f2237 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ # Helix -A Quorum based Tangle implementation forked from [**IRI**](https://github.com/iotaledger/iri/). +Pendulum is a quorum based [Tangle](https://github.com/iotaledger/iri/) implementation designed towards reliable timekeeping and messaging. - **Latest release:** 0.6.3 pre-release - **License:** GPLv3 @@ -13,7 +13,7 @@ Special thanks to all of the [IOTA Contributors](https://github.com/iotaledger/i ## Developers - Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on our code of conduct, and the process for submitting pull requests to us. -- Please read the [helix-1.0-specifications](https://github.com/HelixNetwork/helix-specs/tree/master/specs/1.0) before contributing. +- Please read the [pendulum-1.0-specifications](https://github.com/HelixNetwork/helix-specs/tree/master/specs/1.0) before contributing. ## Installing @@ -21,23 +21,23 @@ Make sure you have [**Maven**](https://maven.apache.org/) and [**Java 8**](https ### Download - $ git clone https://github.com/HelixNetwork/helix.git + $ git clone https://github.com/HelixNetwork/pendulum.git ### Build Build an executable jar at the `target` directory using maven. - $ cd helix + $ cd pendulum $ mvn clean package ### Launch Full node - java -jar target/helix-.jar -p 8085 + java -jar target/pendulum-.jar -p 8085 ### Launch Nominee node Launching a node as a nominee first requires to generate a 64 character hex string, that is used as a seed for key generation. You will find the public key in the last line of the `nominee.key` file contained in the resources directory. If you wish to act as a nominee, please send a request to dt@hlx.ai containing your public key. - java -jar target/helix-.jar -p 8085 --nominee + java -jar target/pendulum-.jar -p 8085 --nominee ### Nginx cluster sample config @@ -47,7 +47,7 @@ For production-level applications we recommend exposing a single public API endp Below is a sample configuration file for the popular Nginx webserver (typically put into `/etc/nginx/conf.d/` ). For more information please consult the official Nginx [documentation](https://docs.nginx.com/nginx/admin-guide/web-server/reverse-proxy/) ``` -upstream helix { +upstream pendulum { ip_hash; Server fullnode1.ip.address:8085; Server fullnode2.ip.address:8085; @@ -102,7 +102,7 @@ server { proxy_set_header X-real-ip $remote_addr; proxy_set_header X-forward-for $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass http://helix; + proxy_pass http://pendulum; } } @@ -121,13 +121,12 @@ server { | `--ms-delay` | `-m` | Sets delay for auto-milestones. | `-m 60` | | `--testnet` | | Testnet flag, bypasses milestone signature validation and pow difficulty. | `--testnet` | | `--remote` | | Remotely access your node and send API commands | `--remote` | -| `--remote-auth` | | Require authentication password for accessing remotely. Requires a correct `username:hashedpassword` combination passed to the Auth Header. | `--remote-auth helixtoken:` | +| `--remote-auth` | | Require authentication password for accessing remotely. Requires a correct `username:hashedpassword` combination passed to the Auth Header. | `--remote-auth token:` | | `--remote-limit-api` | | Exclude certain API calls from being able to be accessed remotely | `--remote-limit-api "attachToTangle, addNeighbors"` | | `--send-limit` | | Limit the outbound bandwidth consumption. Limit is set to mbit/s | `--send-limit 1.0` | | `--max-peers` | | Limit the number of max accepted peers. Default is set to 0. | `--max-peers 8` | | `--dns-resolution-false` | | Ignores DNS resolution refreshing | `--dns-resolution-false` | -| `--savelog-enabled` | | Writes the log to file system | `--savelog-enabled` | -| `--pow-disabled` | | Disables searching and validation of nonce. A feature for simnet. | `--pow-disabled` | +| `--savelog-enabled` | | Writes the log to file system | `--savelog-enabled` | | `--pow-disabled` | ### INI From f0e1fd7814fbf7dc46fd7691991e6d0cde6575e9 Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 19:57:53 +0200 Subject: [PATCH 03/16] refactor name pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f522f8aa..24cb6c98 100644 --- a/pom.xml +++ b/pom.xml @@ -270,7 +270,7 @@ - net.helix.hlx.HLX + net.helix.pendulum.Main From af50ae1926bc19a0b5319bc61a24b160eabd387a Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 19:58:24 +0200 Subject: [PATCH 04/16] refactor main classes: HLX/Helix --- .../java/net/helix/hlx/conf/DbConfig.java | 44 --------- .../{hlx => pendulum}/BundleValidator.java | 21 ++-- .../{hlx/HLX.java => pendulum/Main.java} | 71 +++++++------- .../helix/{hlx => pendulum}/OsVariants.java | 2 +- .../Helix.java => pendulum/Pendulum.java} | 97 +++++++++---------- .../helix/{hlx => pendulum}/SignedFiles.java | 6 +- .../TransactionValidator.java | 30 +++--- .../java/net/helix/{hlx => pendulum}/XI.java | 18 ++-- .../net/helix/{hlx => pendulum}/XiEvent.java | 2 +- .../{hlx => pendulum}/conf/APIConfig.java | 2 +- .../conf/BaseHelixConfig.java | 12 +-- .../helix/{hlx => pendulum}/conf/Config.java | 2 +- .../{hlx => pendulum}/conf/ConfigFactory.java | 6 +- .../conf/ConsensusConfig.java | 2 +- .../{hlx => pendulum}/conf/CuratorConfig.java | 4 +- .../{hlx => pendulum}/conf/GraphConfig.java | 2 +- .../{hlx => pendulum}/conf/HelixConfig.java | 2 +- .../{hlx => pendulum}/conf/LoggingConfig.java | 2 +- .../{hlx => pendulum}/conf/MainnetConfig.java | 2 +- .../conf/MilestoneConfig.java | 4 +- .../{hlx => pendulum}/conf/NetworkConfig.java | 2 +- .../{hlx => pendulum}/conf/NodeConfig.java | 2 +- .../{hlx => pendulum}/conf/PoWConfig.java | 2 +- .../conf/ProtocolConfig.java | 2 +- .../conf/SnapshotConfig.java | 2 +- .../conf/SolidificationConfig.java | 2 +- .../{hlx => pendulum}/conf/SpamConfig.java | 2 +- .../{hlx => pendulum}/conf/TestnetConfig.java | 5 +- .../{hlx => pendulum}/conf/TipSelConfig.java | 2 +- .../{hlx => pendulum}/conf/XIConfig.java | 2 +- .../{hlx => pendulum}/conf/ZMQConfig.java | 2 +- .../deserializers/CustomBoolDeserializer.java | 2 +- .../CustomStringDeserializer.java | 2 +- .../controllers/AddressViewModel.java | 16 +-- .../controllers/ApproveeViewModel.java | 16 +-- .../controllers/BundleViewModel.java | 18 ++-- .../controllers/HashesViewModel.java | 8 +- .../controllers/RoundViewModel.java | 30 +++--- .../controllers/StateDiffViewModel.java | 10 +- .../controllers/TagViewModel.java | 18 ++-- .../controllers/TipsViewModel.java | 6 +- .../controllers/TransactionViewModel.java | 22 ++--- .../{hlx => pendulum}/crypto/GreedyMiner.java | 9 +- .../helix/{hlx => pendulum}/crypto/K256.java | 8 +- .../helix/{hlx => pendulum}/crypto/K512.java | 8 +- .../{hlx => pendulum}/crypto/Merkle.java | 10 +- .../helix/{hlx => pendulum}/crypto/Miner.java | 6 +- .../helix/{hlx => pendulum}/crypto/Sha3.java | 10 +- .../{hlx => pendulum}/crypto/Sha3_512.java | 10 +- .../{hlx => pendulum}/crypto/Sponge.java | 2 +- .../crypto/SpongeFactory.java | 2 +- .../{hlx => pendulum}/crypto/Winternitz.java | 4 +- ...CouldNotObtainUnsafeInstanceException.java | 2 +- .../exception/IllegalHashLengthException.java | 2 +- .../exception/ThrowableDigestException.java | 2 +- .../{hlx => pendulum}/model/AbstractHash.java | 8 +- .../{hlx => pendulum}/model/AddressHash.java | 2 +- .../{hlx => pendulum}/model/BundleHash.java | 2 +- .../model/BundleNonceHash.java | 2 +- .../helix/{hlx => pendulum}/model/Hash.java | 6 +- .../{hlx => pendulum}/model/HashFactory.java | 6 +- .../helix/{hlx => pendulum}/model/HashId.java | 2 +- .../{hlx => pendulum}/model/HashPrefix.java | 2 +- .../{hlx => pendulum}/model/IntegerIndex.java | 6 +- .../{hlx => pendulum}/model/StateDiff.java | 6 +- .../{hlx => pendulum}/model/TagHash.java | 4 +- .../model/TransactionHash.java | 6 +- .../model/persistables/Address.java | 4 +- .../model/persistables/Approvee.java | 4 +- .../model/persistables/Bundle.java | 4 +- .../model/persistables/BundleNonce.java | 4 +- .../model/persistables/Hashes.java | 8 +- .../model/persistables/Milestone.java | 12 +-- .../model/persistables/Round.java | 6 +- .../model/persistables/SpentAddress.java | 4 +- .../model/persistables/Tag.java | 4 +- .../model/persistables/Transaction.java | 14 +-- .../{hlx => pendulum}/network/Neighbor.java | 2 +- .../helix/{hlx => pendulum}/network/Node.java | 30 +++--- .../network/TCPNeighbor.java | 2 +- .../network/TransactionRequester.java | 10 +- .../network/TransactionRequesterWorker.java | 2 +- .../network/UDPNeighbor.java | 2 +- .../network/UDPReceiver.java | 4 +- .../impl/TransactionRequesterWorkerImpl.java | 24 ++--- .../network/replicator/Replicator.java | 6 +- .../replicator/ReplicatorSinkPool.java | 8 +- .../replicator/ReplicatorSinkProcessor.java | 4 +- .../replicator/ReplicatorSourcePool.java | 4 +- .../replicator/ReplicatorSourceProcessor.java | 12 +-- .../helix/{hlx => pendulum}/service/API.java | 90 ++++++++--------- .../{hlx => pendulum}/service/ApiArgs.java | 66 ++++++------- .../{hlx => pendulum}/service/ApiCommand.java | 2 +- .../service/CallableRequest.java | 2 +- .../{hlx => pendulum}/service/Feature.java | 4 +- .../service/Graphstream.java | 2 +- .../{hlx => pendulum}/service/RemoteAuth.java | 2 +- .../{hlx => pendulum}/service/Spammer.java | 6 +- .../service/TipsSolidifier.java | 14 +-- .../service/ValidationException.java | 2 +- .../service/curator/CandidateSolidifier.java | 4 +- .../service/curator/CandidateTracker.java | 7 +- .../service/curator/CandidateValidity.java | 2 +- .../service/curator/CuratorException.java | 2 +- .../service/curator/CuratorService.java | 10 +- .../curator/impl/CandidateSolidifierImpl.java | 18 ++-- .../curator/impl/CandidateTrackerImpl.java | 41 ++++---- .../curator/impl/CuratorServiceImpl.java | 31 +++--- .../curator/impl/NomineePublisher.java | 8 +- .../service/dto/AbstractResponse.java | 2 +- .../service/dto/AccessLimitedResponse.java | 2 +- .../service/dto/AddedNeighborsResponse.java | 2 +- .../service/dto/AttachToTangleResponse.java | 4 +- .../service/dto/CheckConsistency.java | 4 +- .../service/dto/ErrorResponse.java | 4 +- .../service/dto/ExceptionResponse.java | 4 +- .../service/dto/FindTransactionsResponse.java | 4 +- .../service/dto/GetBalancesResponse.java | 4 +- .../dto/GetInclusionStatesResponse.java | 4 +- .../service/dto/GetNeighborsResponse.java | 14 +-- .../dto/GetNodeAPIConfigurationResponse.java | 8 +- .../service/dto/GetNodeInfoResponse.java | 8 +- .../service/dto/GetTipsResponse.java | 4 +- .../dto/GetTransactionStringsResponse.java | 6 +- .../dto/GetTransactionsToApproveResponse.java | 6 +- .../service/dto/RemoveNeighborsResponse.java | 4 +- .../service/dto/WereAddressesSpentFrom.java | 4 +- .../service/dto/XIResponse.java | 4 +- .../service/ledger/LedgerException.java | 2 +- .../service/ledger/LedgerService.java | 10 +- .../ledger/impl/LedgerServiceImpl.java | 46 ++++----- .../LatestSolidMilestoneTracker.java | 4 +- .../service/milestone/MilestoneException.java | 2 +- .../service/milestone/MilestoneService.java | 14 +-- .../milestone/MilestoneSolidifier.java | 4 +- .../service/milestone/MilestoneTracker.java | 6 +- .../service/milestone/MilestoneValidity.java | 2 +- .../milestone/SeenMilestonesRetriever.java | 2 +- .../impl/LatestSolidMilestoneTrackerImpl.java | 34 +++---- .../milestone/impl/MilestonePublisher.java | 17 ++-- .../milestone/impl/MilestoneServiceImpl.java | 41 ++++---- .../impl/MilestoneSolidifierImpl.java | 18 ++-- .../milestone/impl/MilestoneTrackerImpl.java | 32 +++--- .../impl/SeenMilestonesRetrieverImpl.java | 24 ++--- .../service/nominee/NomineeException.java | 2 +- .../service/nominee/NomineeService.java | 6 +- .../service/nominee/NomineeSolidifier.java | 4 +- .../service/nominee/NomineeTracker.java | 4 +- .../service/nominee/NomineeValidity.java | 2 +- .../nominee/impl/NomineeServiceImpl.java | 31 +++--- .../nominee/impl/NomineeSolidifierImpl.java | 18 ++-- .../nominee/impl/NomineeTrackerImpl.java | 38 ++++---- .../service/restserver/ApiProcessor.java | 4 +- .../service/restserver/RestConnector.java | 2 +- .../service/restserver/resteasy/RestEasy.java | 24 ++--- .../snapshot/LocalSnapshotManager.java | 8 +- .../service/snapshot/Snapshot.java | 2 +- .../service/snapshot/SnapshotException.java | 2 +- .../service/snapshot/SnapshotMetaData.java | 5 +- .../service/snapshot/SnapshotProvider.java | 2 +- .../service/snapshot/SnapshotService.java | 11 +-- .../service/snapshot/SnapshotState.java | 4 +- .../service/snapshot/SnapshotStateDiff.java | 4 +- .../impl/LocalSnapshotManagerImpl.java | 34 +++---- .../service/snapshot/impl/SnapshotImpl.java | 7 +- .../snapshot/impl/SnapshotMetaDataImpl.java | 8 +- .../snapshot/impl/SnapshotProviderImpl.java | 20 ++-- .../snapshot/impl/SnapshotServiceImpl.java | 46 ++++----- .../snapshot/impl/SnapshotStateDiffImpl.java | 8 +- .../snapshot/impl/SnapshotStateImpl.java | 12 +-- .../SpentAddressesException.java | 2 +- .../SpentAddressesProvider.java | 4 +- .../spentaddresses/SpentAddressesService.java | 6 +- .../impl/SpentAddressesProviderImpl.java | 28 +++--- .../impl/SpentAddressesServiceImpl.java | 30 +++--- .../stats/TimeWindowedApproveeCounter.java | 12 +-- .../stats/TransactionStatsPublisher.java | 12 +-- .../tipselection/EntryPointSelector.java | 6 +- .../tipselection/RatingCalculator.java | 8 +- .../service/tipselection/TailFinder.java | 6 +- .../service/tipselection/TipSelector.java | 4 +- .../service/tipselection/WalkValidator.java | 4 +- .../service/tipselection/Walker.java | 8 +- .../impl/CumulativeWeightCalculator.java | 28 +++--- .../impl/EntryPointSelectorImpl.java | 14 +-- .../service/tipselection/impl/RatingOne.java | 18 ++-- .../tipselection/impl/TailFinderImpl.java | 10 +- .../tipselection/impl/TipSelectorImpl.java | 22 ++--- .../tipselection/impl/WalkValidatorImpl.java | 16 +-- .../tipselection/impl/WalkerAlpha.java | 22 ++--- .../transactionpruning/TransactionPruner.java | 8 +- .../TransactionPrunerJob.java | 10 +- .../TransactionPrunerJobStatus.java | 2 +- .../TransactionPruningException.java | 2 +- .../async/AsyncTransactionPruner.java | 30 +++--- .../transactionpruning/async/JobQueue.java | 6 +- .../async/MilestonePrunerJobQueue.java | 12 +-- .../async/SimpleJobQueue.java | 8 +- .../jobs/AbstractTransactionPrunerJob.java | 18 ++-- .../jobs/MilestonePrunerJob.java | 34 +++---- .../jobs/UnconfirmedSubtanglePrunerJob.java | 24 ++--- .../service/utils/RoundIndexUtil.java | 6 +- .../{hlx => pendulum}/storage/Indexable.java | 2 +- .../storage/Persistable.java | 2 +- .../storage/PersistenceProvider.java | 4 +- .../{hlx => pendulum}/storage/Tangle.java | 16 +-- .../rocksdb/RocksDBPersistenceProvider.java | 19 ++-- .../{hlx => pendulum}/utils/Converter.java | 2 +- .../utils/FastByteComparisons.java | 4 +- .../{hlx => pendulum}/utils/HelixIOUtils.java | 2 +- .../{hlx => pendulum}/utils/HelixUtils.java | 4 +- .../utils/MapIdentityManager.java | 4 +- .../helix/{hlx => pendulum}/utils/Pair.java | 2 +- .../{hlx => pendulum}/utils/SafeUtils.java | 2 +- .../{hlx => pendulum}/utils/Serializer.java | 2 +- .../utils/bundle/BundleTypes.java | 2 +- .../utils/bundle/BundleUtils.java | 18 ++-- .../collections/impl/BoundedHashSet.java | 4 +- .../impl/TransformingBoundedHashSet.java | 2 +- .../collections/impl/TransformingMap.java | 4 +- .../interfaces/BoundedCollection.java | 2 +- .../collections/interfaces/BoundedSet.java | 2 +- .../collections/interfaces/UnIterableMap.java | 2 +- .../utils/dag/DAGHelper.java | 10 +- .../utils/dag/TraversalException.java | 2 +- .../{hlx => pendulum}/utils/log/Logger.java | 2 +- .../utils/log/ProgressLogger.java | 2 +- .../utils/log/interval/IntervalLogger.java | 4 +- .../log/interval/IntervalProgressLogger.java | 4 +- .../BoundedScheduledExecutorService.java | 4 +- .../DedicatedScheduledExecutorService.java | 10 +- .../thread/ReportingExecutorService.java | 2 +- .../SilentScheduledExecutorService.java | 2 +- .../utils/thread/TaskDetails.java | 2 +- .../utils/thread/ThreadIdentifier.java | 2 +- .../utils/thread/ThreadUtils.java | 2 +- .../helix/{hlx => pendulum}/zmq/MessageQ.java | 6 +- .../zmq/MessageQProvider.java | 10 +- .../zmq/MessageQProviderImpl.java | 16 +-- .../dbbenchmark/RocksDbBenchmark.java | 44 --------- .../dbbenchmark/states/DbState.java | 85 ---------------- .../dbbenchmark/states/EmptyState.java | 26 ----- .../dbbenchmark/states/FullState.java | 52 ---------- .../BundleValidatorTest.java | 18 ++-- .../helix/{hlx => pendulum}/HelixTest.java | 2 +- .../{hlx => pendulum}/TangleMockUtils.java | 20 ++-- .../TransactionTestUtils.java | 14 +-- .../TransactionValidatorTest.java | 26 ++--- .../net/helix/{hlx => pendulum}/XITest.java | 8 +- .../benchmarks/BenchmarkRunner.java | 4 +- .../crypto/GreedyMinerBenchmark.java | 4 +- .../benchmarks/crypto/Sha3Benchmark.java | 6 +- .../{hlx => pendulum}/conf/ConfigTest.java | 4 +- .../{hlx => pendulum}/conf/ZMQConfigTest.java | 2 +- .../controllers/BundleViewModelTest.java | 18 ++-- .../controllers/TipsViewModelTest.java | 6 +- .../controllers/TransactionViewModelTest.java | 22 ++--- .../crypto/GreedyMinerTest.java | 4 +- .../{hlx => pendulum}/crypto/K256Test.java | 2 +- .../{hlx => pendulum}/crypto/K512Test.java | 2 +- .../{hlx => pendulum}/crypto/KeccakTest.java | 2 +- .../{hlx => pendulum}/crypto/MinerTest.java | 4 +- .../{hlx => pendulum}/crypto/Sha3Test.java | 2 +- .../crypto/Sha3_512Test.java | 2 +- .../crypto/WinternitzTest.java | 8 +- .../{hlx => pendulum}/model/HashTest.java | 8 +- .../model/persistables/HashesTest.java | 6 +- .../model/persistables/RoundTest.java | 6 +- .../model/persistables/TransactionTest.java | 8 +- .../{hlx => pendulum}/network/NodeTest.java | 14 +-- .../network/TransactionRequesterTest.java | 14 +-- .../network/UDPNeighborTest.java | 2 +- .../service/APICallTest.java | 4 +- .../service/APIIntegrationTest.java | 34 +++---- .../{hlx => pendulum}/service/APITest.java | 10 +- .../service/MilestoneTest.java | 0 .../service/restserver/RestEasyTest.java | 10 +- .../impl/LocalSnapshotManagerImplTest.java | 16 +-- .../snapshot/impl/SnapshotImplTest.java | 12 +-- .../impl/SnapshotMetaDataImplTest.java | 10 +- .../snapshot/impl/SnapshotMockUtils.java | 10 +- .../impl/SnapshotProviderImplTest.java | 12 +-- .../impl/SnapshotServiceImplTest.java | 30 +++--- .../impl/SnapshotStateDiffImplTest.java | 6 +- .../snapshot/impl/SnapshotStateImplTest.java | 14 +-- .../impl/CumulativeWeightCalculatorTest.java | 32 +++--- .../impl/EntryPointSelectorImplTest.java | 24 ++--- .../tipselection/impl/RatingOneTest.java | 26 ++--- .../tipselection/impl/TailFinderImplTest.java | 28 +++--- .../impl/WalkValidatorImplTest.java | 26 ++--- .../tipselection/impl/WalkerAlphaTest.java | 32 +++--- .../{hlx => pendulum}/storage/TangleTest.java | 20 ++-- .../RocksDBPersistenceProviderTest.java | 16 ++- .../utils/MapIdentityManagerTest.java | 2 +- .../utils/SerializerTest.java | 2 +- .../collections/impl/BoundedHashSetTest.java | 2 +- 296 files changed, 1449 insertions(+), 1751 deletions(-) delete mode 100644 src/main/java/net/helix/hlx/conf/DbConfig.java rename src/main/java/net/helix/{hlx => pendulum}/BundleValidator.java (97%) rename src/main/java/net/helix/{hlx/HLX.java => pendulum/Main.java} (79%) rename src/main/java/net/helix/{hlx => pendulum}/OsVariants.java (64%) rename src/main/java/net/helix/{hlx/Helix.java => pendulum/Pendulum.java} (81%) rename src/main/java/net/helix/{hlx => pendulum}/SignedFiles.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/TransactionValidator.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/XI.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/XiEvent.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/conf/APIConfig.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/conf/BaseHelixConfig.java (99%) rename src/main/java/net/helix/{hlx => pendulum}/conf/Config.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/conf/ConfigFactory.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/conf/ConsensusConfig.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/conf/CuratorConfig.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/conf/GraphConfig.java (83%) rename src/main/java/net/helix/{hlx => pendulum}/conf/HelixConfig.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/conf/LoggingConfig.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/conf/MainnetConfig.java (79%) rename src/main/java/net/helix/{hlx => pendulum}/conf/MilestoneConfig.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/conf/NetworkConfig.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/conf/NodeConfig.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/conf/PoWConfig.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/conf/ProtocolConfig.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/conf/SnapshotConfig.java (99%) rename src/main/java/net/helix/{hlx => pendulum}/conf/SolidificationConfig.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/conf/SpamConfig.java (86%) rename src/main/java/net/helix/{hlx => pendulum}/conf/TestnetConfig.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/conf/TipSelConfig.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/conf/XIConfig.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/conf/ZMQConfig.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/conf/deserializers/CustomBoolDeserializer.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/conf/deserializers/CustomStringDeserializer.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/controllers/AddressViewModel.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/controllers/ApproveeViewModel.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/controllers/BundleViewModel.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/controllers/HashesViewModel.java (79%) rename src/main/java/net/helix/{hlx => pendulum}/controllers/RoundViewModel.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/controllers/StateDiffViewModel.java (88%) rename src/main/java/net/helix/{hlx => pendulum}/controllers/TagViewModel.java (84%) rename src/main/java/net/helix/{hlx => pendulum}/controllers/TipsViewModel.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/controllers/TransactionViewModel.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/crypto/GreedyMiner.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/crypto/K256.java (88%) rename src/main/java/net/helix/{hlx => pendulum}/crypto/K512.java (88%) rename src/main/java/net/helix/{hlx => pendulum}/crypto/Merkle.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/crypto/Miner.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/crypto/Sha3.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/crypto/Sha3_512.java (87%) rename src/main/java/net/helix/{hlx => pendulum}/crypto/Sponge.java (86%) rename src/main/java/net/helix/{hlx => pendulum}/crypto/SpongeFactory.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/crypto/Winternitz.java (99%) rename src/main/java/net/helix/{hlx => pendulum}/exception/CouldNotObtainUnsafeInstanceException.java (68%) rename src/main/java/net/helix/{hlx => pendulum}/exception/IllegalHashLengthException.java (80%) rename src/main/java/net/helix/{hlx => pendulum}/exception/ThrowableDigestException.java (79%) rename src/main/java/net/helix/{hlx => pendulum}/model/AbstractHash.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/model/AddressHash.java (89%) rename src/main/java/net/helix/{hlx => pendulum}/model/BundleHash.java (89%) rename src/main/java/net/helix/{hlx => pendulum}/model/BundleNonceHash.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/model/Hash.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/model/HashFactory.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/model/HashId.java (83%) rename src/main/java/net/helix/{hlx => pendulum}/model/HashPrefix.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/model/IntegerIndex.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/model/StateDiff.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/model/TagHash.java (69%) rename src/main/java/net/helix/{hlx => pendulum}/model/TransactionHash.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/model/persistables/Address.java (77%) rename src/main/java/net/helix/{hlx => pendulum}/model/persistables/Approvee.java (78%) rename src/main/java/net/helix/{hlx => pendulum}/model/persistables/Bundle.java (78%) rename src/main/java/net/helix/{hlx => pendulum}/model/persistables/BundleNonce.java (70%) rename src/main/java/net/helix/{hlx => pendulum}/model/persistables/Hashes.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/model/persistables/Milestone.java (79%) rename src/main/java/net/helix/{hlx => pendulum}/model/persistables/Round.java (79%) rename src/main/java/net/helix/{hlx => pendulum}/model/persistables/SpentAddress.java (85%) rename src/main/java/net/helix/{hlx => pendulum}/model/persistables/Tag.java (77%) rename src/main/java/net/helix/{hlx => pendulum}/model/persistables/Transaction.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/network/Neighbor.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/network/Node.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/network/TCPNeighbor.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/network/TransactionRequester.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/network/TransactionRequesterWorker.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/network/UDPNeighbor.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/network/UDPReceiver.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/network/impl/TransactionRequesterWorkerImpl.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/network/replicator/Replicator.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/network/replicator/ReplicatorSinkPool.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/network/replicator/ReplicatorSinkProcessor.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/network/replicator/ReplicatorSourcePool.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/network/replicator/ReplicatorSourceProcessor.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/API.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/ApiArgs.java (75%) rename src/main/java/net/helix/{hlx => pendulum}/service/ApiCommand.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/service/CallableRequest.java (74%) rename src/main/java/net/helix/{hlx => pendulum}/service/Feature.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/service/Graphstream.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/service/RemoteAuth.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/Spammer.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/service/TipsSolidifier.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/service/ValidationException.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/curator/CandidateSolidifier.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/curator/CandidateTracker.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/service/curator/CandidateValidity.java (80%) rename src/main/java/net/helix/{hlx => pendulum}/service/curator/CuratorException.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/curator/CuratorService.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/service/curator/impl/CandidateSolidifierImpl.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/curator/impl/CandidateTrackerImpl.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/curator/impl/CuratorServiceImpl.java (89%) rename src/main/java/net/helix/{hlx => pendulum}/service/curator/impl/NomineePublisher.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/AbstractResponse.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/AccessLimitedResponse.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/AddedNeighborsResponse.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/AttachToTangleResponse.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/CheckConsistency.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/ErrorResponse.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/ExceptionResponse.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/FindTransactionsResponse.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/GetBalancesResponse.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/GetInclusionStatesResponse.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/GetNeighborsResponse.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/GetNodeAPIConfigurationResponse.java (89%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/GetNodeInfoResponse.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/GetTipsResponse.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/GetTransactionStringsResponse.java (88%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/GetTransactionsToApproveResponse.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/RemoveNeighborsResponse.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/WereAddressesSpentFrom.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/dto/XIResponse.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/service/ledger/LedgerException.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/ledger/LedgerService.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/service/ledger/impl/LedgerServiceImpl.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/LatestSolidMilestoneTracker.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/MilestoneException.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/MilestoneService.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/MilestoneSolidifier.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/MilestoneTracker.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/MilestoneValidity.java (81%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/SeenMilestonesRetriever.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/impl/LatestSolidMilestoneTrackerImpl.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/impl/MilestonePublisher.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/impl/MilestoneServiceImpl.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/impl/MilestoneSolidifierImpl.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/impl/MilestoneTrackerImpl.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/service/milestone/impl/SeenMilestonesRetrieverImpl.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/service/nominee/NomineeException.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/nominee/NomineeService.java (86%) rename src/main/java/net/helix/{hlx => pendulum}/service/nominee/NomineeSolidifier.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/nominee/NomineeTracker.java (86%) rename src/main/java/net/helix/{hlx => pendulum}/service/nominee/NomineeValidity.java (80%) rename src/main/java/net/helix/{hlx => pendulum}/service/nominee/impl/NomineeServiceImpl.java (82%) rename src/main/java/net/helix/{hlx => pendulum}/service/nominee/impl/NomineeSolidifierImpl.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/service/nominee/impl/NomineeTrackerImpl.java (89%) rename src/main/java/net/helix/{hlx => pendulum}/service/restserver/ApiProcessor.java (81%) rename src/main/java/net/helix/{hlx => pendulum}/service/restserver/RestConnector.java (92%) rename src/main/java/net/helix/{hlx => pendulum}/service/restserver/resteasy/RestEasy.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/LocalSnapshotManager.java (75%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/Snapshot.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/SnapshotException.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/SnapshotMetaData.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/SnapshotProvider.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/SnapshotService.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/SnapshotState.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/SnapshotStateDiff.java (88%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/impl/LocalSnapshotManagerImpl.java (87%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotImpl.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotMetaDataImpl.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotProviderImpl.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotServiceImpl.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotStateDiffImpl.java (87%) rename src/main/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotStateImpl.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/service/spentaddresses/SpentAddressesException.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/service/spentaddresses/SpentAddressesProvider.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/service/spentaddresses/SpentAddressesService.java (88%) rename src/main/java/net/helix/{hlx => pendulum}/service/spentaddresses/impl/SpentAddressesProviderImpl.java (85%) rename src/main/java/net/helix/{hlx => pendulum}/service/spentaddresses/impl/SpentAddressesServiceImpl.java (86%) rename src/main/java/net/helix/{hlx => pendulum}/service/stats/TimeWindowedApproveeCounter.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/service/stats/TransactionStatsPublisher.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/EntryPointSelector.java (79%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/RatingCalculator.java (74%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/TailFinder.java (86%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/TipSelector.java (89%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/WalkValidator.java (84%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/Walker.java (79%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/impl/CumulativeWeightCalculator.java (90%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/impl/EntryPointSelectorImpl.java (83%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/impl/RatingOne.java (73%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/impl/TailFinderImpl.java (86%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/impl/TipSelectorImpl.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/impl/WalkValidatorImpl.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/service/tipselection/impl/WalkerAlpha.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/TransactionPruner.java (85%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/TransactionPrunerJob.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/TransactionPrunerJobStatus.java (76%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/TransactionPruningException.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/async/AsyncTransactionPruner.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/async/JobQueue.java (81%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/async/MilestonePrunerJobQueue.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/async/SimpleJobQueue.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/jobs/AbstractTransactionPrunerJob.java (83%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/jobs/MilestonePrunerJob.java (91%) rename src/main/java/net/helix/{hlx => pendulum}/service/transactionpruning/jobs/UnconfirmedSubtanglePrunerJob.java (83%) rename src/main/java/net/helix/{hlx => pendulum}/service/utils/RoundIndexUtil.java (87%) rename src/main/java/net/helix/{hlx => pendulum}/storage/Indexable.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/storage/Persistable.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/storage/PersistenceProvider.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/storage/Tangle.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/storage/rocksdb/RocksDBPersistenceProvider.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/utils/Converter.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/utils/FastByteComparisons.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/utils/HelixIOUtils.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/utils/HelixUtils.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/utils/MapIdentityManager.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/utils/Pair.java (80%) rename src/main/java/net/helix/{hlx => pendulum}/utils/SafeUtils.java (88%) rename src/main/java/net/helix/{hlx => pendulum}/utils/Serializer.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/utils/bundle/BundleTypes.java (84%) rename src/main/java/net/helix/{hlx => pendulum}/utils/bundle/BundleUtils.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/utils/collections/impl/BoundedHashSet.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/utils/collections/impl/TransformingBoundedHashSet.java (95%) rename src/main/java/net/helix/{hlx => pendulum}/utils/collections/impl/TransformingMap.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/utils/collections/interfaces/BoundedCollection.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/utils/collections/interfaces/BoundedSet.java (78%) rename src/main/java/net/helix/{hlx => pendulum}/utils/collections/interfaces/UnIterableMap.java (94%) rename src/main/java/net/helix/{hlx => pendulum}/utils/dag/DAGHelper.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/utils/dag/TraversalException.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/utils/log/Logger.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/utils/log/ProgressLogger.java (99%) rename src/main/java/net/helix/{hlx => pendulum}/utils/log/interval/IntervalLogger.java (99%) rename src/main/java/net/helix/{hlx => pendulum}/utils/log/interval/IntervalProgressLogger.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/utils/thread/BoundedScheduledExecutorService.java (99%) rename src/main/java/net/helix/{hlx => pendulum}/utils/thread/DedicatedScheduledExecutorService.java (97%) rename src/main/java/net/helix/{hlx => pendulum}/utils/thread/ReportingExecutorService.java (98%) rename src/main/java/net/helix/{hlx => pendulum}/utils/thread/SilentScheduledExecutorService.java (99%) rename src/main/java/net/helix/{hlx => pendulum}/utils/thread/TaskDetails.java (99%) rename src/main/java/net/helix/{hlx => pendulum}/utils/thread/ThreadIdentifier.java (96%) rename src/main/java/net/helix/{hlx => pendulum}/utils/thread/ThreadUtils.java (99%) rename src/main/java/net/helix/{hlx => pendulum}/zmq/MessageQ.java (93%) rename src/main/java/net/helix/{hlx => pendulum}/zmq/MessageQProvider.java (80%) rename src/main/java/net/helix/{hlx => pendulum}/zmq/MessageQProviderImpl.java (93%) delete mode 100644 src/test/java/net/helix/hlx/benchmarks/dbbenchmark/RocksDbBenchmark.java delete mode 100644 src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/DbState.java delete mode 100644 src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/EmptyState.java delete mode 100644 src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/FullState.java rename src/test/java/net/helix/{hlx => pendulum}/BundleValidatorTest.java (96%) rename src/test/java/net/helix/{hlx => pendulum}/HelixTest.java (50%) rename src/test/java/net/helix/{hlx => pendulum}/TangleMockUtils.java (89%) rename src/test/java/net/helix/{hlx => pendulum}/TransactionTestUtils.java (96%) rename src/test/java/net/helix/{hlx => pendulum}/TransactionValidatorTest.java (94%) rename src/test/java/net/helix/{hlx => pendulum}/XITest.java (92%) rename src/test/java/net/helix/{hlx => pendulum}/benchmarks/BenchmarkRunner.java (93%) rename src/test/java/net/helix/{hlx => pendulum}/benchmarks/crypto/GreedyMinerBenchmark.java (95%) rename src/test/java/net/helix/{hlx => pendulum}/benchmarks/crypto/Sha3Benchmark.java (94%) rename src/test/java/net/helix/{hlx => pendulum}/conf/ConfigTest.java (99%) rename src/test/java/net/helix/{hlx => pendulum}/conf/ZMQConfigTest.java (98%) rename src/test/java/net/helix/{hlx => pendulum}/controllers/BundleViewModelTest.java (77%) rename src/test/java/net/helix/{hlx => pendulum}/controllers/TipsViewModelTest.java (90%) rename src/test/java/net/helix/{hlx => pendulum}/controllers/TransactionViewModelTest.java (96%) rename src/test/java/net/helix/{hlx => pendulum}/crypto/GreedyMinerTest.java (94%) rename src/test/java/net/helix/{hlx => pendulum}/crypto/K256Test.java (97%) rename src/test/java/net/helix/{hlx => pendulum}/crypto/K512Test.java (98%) rename src/test/java/net/helix/{hlx => pendulum}/crypto/KeccakTest.java (99%) rename src/test/java/net/helix/{hlx => pendulum}/crypto/MinerTest.java (93%) rename src/test/java/net/helix/{hlx => pendulum}/crypto/Sha3Test.java (97%) rename src/test/java/net/helix/{hlx => pendulum}/crypto/Sha3_512Test.java (98%) rename src/test/java/net/helix/{hlx => pendulum}/crypto/WinternitzTest.java (92%) rename src/test/java/net/helix/{hlx => pendulum}/model/HashTest.java (95%) rename src/test/java/net/helix/{hlx => pendulum}/model/persistables/HashesTest.java (84%) rename src/test/java/net/helix/{hlx => pendulum}/model/persistables/RoundTest.java (86%) rename src/test/java/net/helix/{hlx => pendulum}/model/persistables/TransactionTest.java (85%) rename src/test/java/net/helix/{hlx => pendulum}/network/NodeTest.java (89%) rename src/test/java/net/helix/{hlx => pendulum}/network/TransactionRequesterTest.java (90%) rename src/test/java/net/helix/{hlx => pendulum}/network/UDPNeighborTest.java (97%) rename src/test/java/net/helix/{hlx => pendulum}/service/APICallTest.java (83%) rename src/test/java/net/helix/{hlx => pendulum}/service/APIIntegrationTest.java (93%) rename src/test/java/net/helix/{hlx => pendulum}/service/APITest.java (93%) rename src/test/java/net/helix/{hlx => pendulum}/service/MilestoneTest.java (100%) rename src/test/java/net/helix/{hlx => pendulum}/service/restserver/RestEasyTest.java (91%) rename src/test/java/net/helix/{hlx => pendulum}/service/snapshot/impl/LocalSnapshotManagerImplTest.java (89%) rename src/test/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotImplTest.java (86%) rename src/test/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotMetaDataImplTest.java (94%) rename src/test/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotMockUtils.java (93%) rename src/test/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotProviderImplTest.java (85%) rename src/test/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotServiceImplTest.java (91%) rename src/test/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotStateDiffImplTest.java (89%) rename src/test/java/net/helix/{hlx => pendulum}/service/snapshot/impl/SnapshotStateImplTest.java (90%) rename src/test/java/net/helix/{hlx => pendulum}/service/tipselection/impl/CumulativeWeightCalculatorTest.java (94%) rename src/test/java/net/helix/{hlx => pendulum}/service/tipselection/impl/EntryPointSelectorImplTest.java (78%) rename src/test/java/net/helix/{hlx => pendulum}/service/tipselection/impl/RatingOneTest.java (79%) rename src/test/java/net/helix/{hlx => pendulum}/service/tipselection/impl/TailFinderImplTest.java (78%) rename src/test/java/net/helix/{hlx => pendulum}/service/tipselection/impl/WalkValidatorImplTest.java (93%) rename src/test/java/net/helix/{hlx => pendulum}/service/tipselection/impl/WalkerAlphaTest.java (91%) rename src/test/java/net/helix/{hlx => pendulum}/storage/TangleTest.java (78%) rename src/test/java/net/helix/{hlx => pendulum}/storage/rocksdb/RocksDBPersistenceProviderTest.java (89%) rename src/test/java/net/helix/{hlx => pendulum}/utils/MapIdentityManagerTest.java (96%) rename src/test/java/net/helix/{hlx => pendulum}/utils/SerializerTest.java (92%) rename src/test/java/net/helix/{hlx => pendulum}/utils/collections/impl/BoundedHashSetTest.java (93%) diff --git a/src/main/java/net/helix/hlx/conf/DbConfig.java b/src/main/java/net/helix/hlx/conf/DbConfig.java deleted file mode 100644 index aad80b6f..00000000 --- a/src/main/java/net/helix/hlx/conf/DbConfig.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.helix.hlx.conf; - -public interface DbConfig extends Config { - /** - * @return Descriptions#DB_PATH - */ - String getDbPath(); - - /** - * @return {@value Descriptions#DB_LOG_PATH} - */ - String getDbLogPath(); - - /** - * @return {@value Descriptions#DB_CACHE_SIZE} - */ - int getDbCacheSize(); - - /** - * @return {@value Descriptions#MAIN_DB} - */ - String getMainDb(); - - /** - * @return {@value Descriptions#REVALIDATE} - */ - boolean isRevalidate(); - - /** - * @return {@value Descriptions#RESCAN_DB} - */ - boolean isRescanDb(); - - interface Descriptions { - - String DB_PATH = "The folder where the DB saves its data."; - String DB_LOG_PATH = "The folder where the DB logs info"; - String DB_CACHE_SIZE = "The size of the DB cache in KB"; - String MAIN_DB = "The DB engine used to store the transactions. Currently only RocksDB is supported."; - String REVALIDATE = "Reload from the db data about confirmed transaction (milestones), state of the ledger, " + - "and transaction metadata."; - String RESCAN_DB = "Rescan all transaction metadata (Approvees, Bundles, and Tags)"; - } -} diff --git a/src/main/java/net/helix/hlx/BundleValidator.java b/src/main/java/net/helix/pendulum/BundleValidator.java similarity index 97% rename from src/main/java/net/helix/hlx/BundleValidator.java rename to src/main/java/net/helix/pendulum/BundleValidator.java index 3c5f7d97..122b7200 100644 --- a/src/main/java/net/helix/hlx/BundleValidator.java +++ b/src/main/java/net/helix/pendulum/BundleValidator.java @@ -1,14 +1,13 @@ -package net.helix.hlx; - -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.Sha3; -import net.helix.hlx.crypto.Sponge; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.crypto.Winternitz; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.Snapshot; -import net.helix.hlx.storage.Tangle; -import org.bouncycastle.util.encoders.Hex; +package net.helix.pendulum; + +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.Sha3; +import net.helix.pendulum.crypto.Sponge; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.crypto.Winternitz; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.Snapshot; +import net.helix.pendulum.storage.Tangle; import java.util.*; diff --git a/src/main/java/net/helix/hlx/HLX.java b/src/main/java/net/helix/pendulum/Main.java similarity index 79% rename from src/main/java/net/helix/hlx/HLX.java rename to src/main/java/net/helix/pendulum/Main.java index 49396c3e..f0c6e332 100644 --- a/src/main/java/net/helix/hlx/HLX.java +++ b/src/main/java/net/helix/pendulum/Main.java @@ -1,18 +1,17 @@ -package net.helix.hlx; +package net.helix.pendulum; import com.beust.jcommander.JCommander; import com.beust.jcommander.ParameterException; -import net.helix.hlx.conf.BaseHelixConfig; -import net.helix.hlx.conf.Config; -import net.helix.hlx.conf.ConfigFactory; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.service.API; -import net.helix.hlx.service.ApiArgs; -import net.helix.hlx.service.Spammer; -import net.helix.hlx.service.milestone.impl.MilestonePublisher; -import net.helix.hlx.service.curator.impl.NomineePublisher; -import net.helix.hlx.service.restserver.resteasy.RestEasy; -import net.helix.hlx.utils.HelixIOUtils; +import net.helix.pendulum.conf.BaseHelixConfig; +import net.helix.pendulum.conf.Config; +import net.helix.pendulum.conf.ConfigFactory; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.service.API; +import net.helix.pendulum.service.ApiArgs; +import net.helix.pendulum.service.Spammer; +import net.helix.pendulum.service.milestone.impl.MilestonePublisher; +import net.helix.pendulum.service.restserver.resteasy.RestEasy; +import net.helix.pendulum.utils.HelixIOUtils; import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -26,11 +25,11 @@ * * Main starting class. *

- * Running the HLX software enables your device to communicate with neighbors + * Running the Pendulum software enables your device to communicate with neighbors * in the peer-to-peer network that the Tangle operates on. *

*

- * HLX implements all the core functionality necessary for participating in the Helix network as a full node. + * The Main class implements all the core functionality necessary for participating in the Helix network as a full node. * This includes, but is not limited to: *

    *
  • Receiving and broadcasting transactions through TCP and UDP.
    • @@ -42,27 +41,27 @@ * * @see Online documentation on hlx */ -public class HLX { +public class Main { - public static final String MAINNET_NAME = "HLX"; - public static final String TESTNET_NAME = "HLX Testnet"; + public static final String MAINNET_NAME = "Pendulum"; + public static final String TESTNET_NAME = "Pendulum Testnet"; public static final String VERSION = "0.6.3"; /** - * The entry point of the helix sandbox. - * Starts by configuring the logging settings, then proceeds to {@link HLXLauncher#main(String[])} + * The entry point of Pendulum. + * Starts by configuring the logging settings, then proceeds to {@link MainLauncher#main(String[])} * The log level is set to INFO by default. * * @param args Configuration arguments. See {@link BaseHelixConfig} for a list of all options. - * @throws Exception If we fail to start the HLX launcher. + * @throws Exception If we fail to start the MainLauncher. */ public static void main(String[] args) throws Exception { // Logging is configured first before any references to Logger or LoggerFactory. - // Any public method or field accessors needed in HLX should be put in HLX and then delegate to HLXLauncher. That + // Any public method or field accessors needed in Main should be put in Main and then delegated to MainLauncher. That // ensures that future code does not need to know about this setup. configureLogging(); - HLXLauncher.main(args); + MainLauncher.main(args); } private static void configureLogging() { @@ -91,10 +90,10 @@ private static void configureLogging() { } } - private static class HLXLauncher { - private static final Logger log = LoggerFactory.getLogger(HLXLauncher.class); + private static class MainLauncher { + private static final Logger log = LoggerFactory.getLogger(MainLauncher.class); - public static Helix helix; + public static Pendulum pendulum; public static API api; public static XI XI; public static MilestonePublisher milestonePublisher; @@ -105,9 +104,9 @@ private static class HLXLauncher { * Starts hlx. Setup is as follows: *
      *
    • Load the configuration.
      • - *
    • Create {@link Helix}, {@link XI} and {@link API}.
      • + *
    • Create {@link Pendulum}, {@link XI} and {@link API}.
      • *
    • Listen for node shutdown.
      • - *
    • Initialize {@link Helix}, {@link XI} and {@link API} using their init() methods.
      • + *
    • Initialize {@link Pendulum}, {@link XI} and {@link API} using their init() methods.
      • *
    * * If no exception is thrown, the node starts synchronizing with the network, and the API can be used. @@ -119,15 +118,15 @@ public static void main(String [] args) throws Exception { HelixConfig config = createConfiguration(args); log.info("Welcome to {} {}", config.isTestnet() ? TESTNET_NAME : MAINNET_NAME, VERSION); - helix = new Helix(config); - XI = new XI(helix); - ApiArgs apiArgs = new ApiArgs(helix, XI); + pendulum = new Pendulum(config); + XI = new XI(pendulum); + ApiArgs apiArgs = new ApiArgs(pendulum, XI); api = new API(apiArgs); shutdownHook(); try { - helix.init(); - api.init(new RestEasy(helix.configuration)); + pendulum.init(); + api.init(new RestEasy(pendulum.configuration)); //TODO redundant parameter but we will touch this when we refactor XI XI.init(config.getXiDir()); log.info("Helix Node initialised correctly."); @@ -136,7 +135,7 @@ public static void main(String [] args) throws Exception { throw e; } if (config.getNominee() != null || new File(config.getNomineeKeyfile()).isFile() ) { - milestonePublisher = new MilestonePublisher(config, api, helix.candidateTracker); + milestonePublisher = new MilestonePublisher(config, api, pendulum.candidateTracker); milestonePublisher.startScheduledExecutorService(); } /*if (config.getCuratorEnabled()) { @@ -151,14 +150,14 @@ public static void main(String [] args) throws Exception { } /** - * Gracefully shuts down the node by calling shutdown() on {@link Helix}, {@link XI} and {@link API}. + * Gracefully shuts down the node by calling shutdown() on {@link Pendulum}, {@link XI} and {@link API}. * Exceptions during shutdown are caught and logged. */ private static void shutdownHook() { Runtime.getRuntime().addShutdownHook(new Thread(() -> { log.info("Shutting down Helix node, please hold tight..."); try { - if (helix.configuration.getNominee() != null || new File(helix.configuration.getNomineeKeyfile()).isFile()) { + if (pendulum.configuration.getNominee() != null || new File(pendulum.configuration.getNomineeKeyfile()).isFile()) { milestonePublisher.shutdown(); } /*if (helix.configuration.getCuratorEnabled()) { @@ -166,7 +165,7 @@ private static void shutdownHook() { }*/ XI.shutdown(); api.shutDown(); - helix.shutdown(); + pendulum.shutdown(); } catch (Exception e) { log.error("Exception occurred shutting down Helix node: ", e); } diff --git a/src/main/java/net/helix/hlx/OsVariants.java b/src/main/java/net/helix/pendulum/OsVariants.java similarity index 64% rename from src/main/java/net/helix/hlx/OsVariants.java rename to src/main/java/net/helix/pendulum/OsVariants.java index 46afdd9b..43a80907 100644 --- a/src/main/java/net/helix/hlx/OsVariants.java +++ b/src/main/java/net/helix/pendulum/OsVariants.java @@ -1,4 +1,4 @@ -package net.helix.hlx; +package net.helix.pendulum; public enum OsVariants { Windows, diff --git a/src/main/java/net/helix/hlx/Helix.java b/src/main/java/net/helix/pendulum/Pendulum.java similarity index 81% rename from src/main/java/net/helix/hlx/Helix.java rename to src/main/java/net/helix/pendulum/Pendulum.java index a35af712..f712add0 100644 --- a/src/main/java/net/helix/hlx/Helix.java +++ b/src/main/java/net/helix/pendulum/Pendulum.java @@ -1,39 +1,38 @@ -package net.helix.hlx; +package net.helix.pendulum; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.conf.TipSelConfig; -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.network.Node; -import net.helix.hlx.network.TransactionRequester; -import net.helix.hlx.network.UDPReceiver; -import net.helix.hlx.network.impl.TransactionRequesterWorkerImpl; -import net.helix.hlx.network.replicator.Replicator; -import net.helix.hlx.service.Graphstream; -import net.helix.hlx.service.TipsSolidifier; -import net.helix.hlx.service.ledger.impl.LedgerServiceImpl; -import net.helix.hlx.service.milestone.impl.*; -import net.helix.hlx.service.nominee.impl.*; -import net.helix.hlx.service.curator.impl.*; -import net.helix.hlx.service.snapshot.SnapshotException; -import net.helix.hlx.service.snapshot.impl.LocalSnapshotManagerImpl; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.service.snapshot.impl.SnapshotServiceImpl; -import net.helix.hlx.service.spentaddresses.SpentAddressesException; -import net.helix.hlx.service.spentaddresses.impl.SpentAddressesProviderImpl; -import net.helix.hlx.service.spentaddresses.impl.SpentAddressesServiceImpl; -import net.helix.hlx.service.stats.TransactionStatsPublisher; -import net.helix.hlx.service.tipselection.*; -import net.helix.hlx.service.tipselection.impl.*; -import net.helix.hlx.service.transactionpruning.TransactionPruningException; -import net.helix.hlx.service.transactionpruning.async.AsyncTransactionPruner; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.storage.PersistenceProvider; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; -import net.helix.hlx.utils.Pair; -import net.helix.hlx.zmq.MessageQProviderImpl; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.conf.TipSelConfig; +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.network.Node; +import net.helix.pendulum.network.TransactionRequester; +import net.helix.pendulum.network.UDPReceiver; +import net.helix.pendulum.network.impl.TransactionRequesterWorkerImpl; +import net.helix.pendulum.network.replicator.Replicator; +import net.helix.pendulum.service.Graphstream; +import net.helix.pendulum.service.TipsSolidifier; +import net.helix.pendulum.service.ledger.impl.LedgerServiceImpl; +import net.helix.pendulum.service.milestone.impl.*; +import net.helix.pendulum.service.curator.impl.*; +import net.helix.pendulum.service.snapshot.SnapshotException; +import net.helix.pendulum.service.snapshot.impl.LocalSnapshotManagerImpl; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.service.snapshot.impl.SnapshotServiceImpl; +import net.helix.pendulum.service.spentaddresses.SpentAddressesException; +import net.helix.pendulum.service.spentaddresses.impl.SpentAddressesProviderImpl; +import net.helix.pendulum.service.spentaddresses.impl.SpentAddressesServiceImpl; +import net.helix.pendulum.service.stats.TransactionStatsPublisher; +import net.helix.pendulum.service.tipselection.*; +import net.helix.pendulum.service.tipselection.impl.*; +import net.helix.pendulum.service.transactionpruning.TransactionPruningException; +import net.helix.pendulum.service.transactionpruning.async.AsyncTransactionPruner; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.storage.PersistenceProvider; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; +import net.helix.pendulum.utils.Pair; +import net.helix.pendulum.zmq.MessageQProviderImpl; import org.apache.commons.lang3.NotImplementedException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -75,8 +74,8 @@ *

    * */ -public class Helix { - private static final Logger log = LoggerFactory.getLogger(Helix.class); +public class Pendulum { + private static final Logger log = LoggerFactory.getLogger(Pendulum.class); public final SpentAddressesProviderImpl spentAddressesProvider; public final SpentAddressesServiceImpl spentAddressesService; @@ -120,7 +119,7 @@ public class Helix { * @throws SnapshotException If the Snapshot fails to initialize. * This can happen if the snapshot signature is invalid or the file cannot be read. */ - public Helix(HelixConfig configuration) throws TransactionPruningException, SnapshotException, SpentAddressesException { + public Pendulum(HelixConfig configuration) throws TransactionPruningException, SnapshotException, SpentAddressesException { this.configuration = configuration; // only initialize Graphstream instance, if the according flag has been passed. @@ -184,9 +183,9 @@ public void init() throws Exception { } if (configuration.isRevalidate()) { - tangle.clearColumn(net.helix.hlx.model.persistables.Round.class); - tangle.clearColumn(net.helix.hlx.model.StateDiff.class); - tangle.clearMetadata(net.helix.hlx.model.persistables.Transaction.class); + tangle.clearColumn(net.helix.pendulum.model.persistables.Round.class); + tangle.clearColumn(net.helix.pendulum.model.StateDiff.class); + tangle.clearMetadata(net.helix.pendulum.model.persistables.Transaction.class); } transactionValidator.init(configuration.isTestnet(), configuration.getMwm()); @@ -253,14 +252,14 @@ private void injectDependencies() throws SnapshotException, TransactionPruningEx private void rescanDb() throws Exception { //delete all transaction indexes - tangle.clearColumn(net.helix.hlx.model.persistables.Address.class); - tangle.clearColumn(net.helix.hlx.model.persistables.Bundle.class); - tangle.clearColumn(net.helix.hlx.model.persistables.Approvee.class); - tangle.clearColumn(net.helix.hlx.model.persistables.BundleNonce.class); - tangle.clearColumn(net.helix.hlx.model.persistables.Tag.class); - tangle.clearColumn(net.helix.hlx.model.persistables.Round.class); - tangle.clearColumn(net.helix.hlx.model.StateDiff.class); - tangle.clearMetadata(net.helix.hlx.model.persistables.Transaction.class); + tangle.clearColumn(net.helix.pendulum.model.persistables.Address.class); + tangle.clearColumn(net.helix.pendulum.model.persistables.Bundle.class); + tangle.clearColumn(net.helix.pendulum.model.persistables.Approvee.class); + tangle.clearColumn(net.helix.pendulum.model.persistables.BundleNonce.class); + tangle.clearColumn(net.helix.pendulum.model.persistables.Tag.class); + tangle.clearColumn(net.helix.pendulum.model.persistables.Round.class); + tangle.clearColumn(net.helix.pendulum.model.StateDiff.class); + tangle.clearMetadata(net.helix.pendulum.model.persistables.Transaction.class); //rescan all tx & refill the columns TransactionViewModel tx = TransactionViewModel.first(tangle); diff --git a/src/main/java/net/helix/hlx/SignedFiles.java b/src/main/java/net/helix/pendulum/SignedFiles.java similarity index 97% rename from src/main/java/net/helix/hlx/SignedFiles.java rename to src/main/java/net/helix/pendulum/SignedFiles.java index aad75531..b51555e7 100644 --- a/src/main/java/net/helix/hlx/SignedFiles.java +++ b/src/main/java/net/helix/pendulum/SignedFiles.java @@ -1,7 +1,7 @@ -package net.helix.hlx; +package net.helix.pendulum; -import net.helix.hlx.crypto.*; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.crypto.*; +import net.helix.pendulum.model.Hash; import org.apache.commons.lang3.ArrayUtils; import org.bouncycastle.util.encoders.Hex; diff --git a/src/main/java/net/helix/hlx/TransactionValidator.java b/src/main/java/net/helix/pendulum/TransactionValidator.java similarity index 97% rename from src/main/java/net/helix/hlx/TransactionValidator.java rename to src/main/java/net/helix/pendulum/TransactionValidator.java index cd82a26d..23023583 100644 --- a/src/main/java/net/helix/hlx/TransactionValidator.java +++ b/src/main/java/net/helix/pendulum/TransactionValidator.java @@ -1,25 +1,23 @@ -package net.helix.hlx; - -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.Merkle; -import net.helix.hlx.crypto.Sponge; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.TransactionHash; -import net.helix.hlx.network.TransactionRequester; -import net.helix.hlx.service.milestone.MilestoneService; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.storage.Tangle; +package net.helix.pendulum; + +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.Sponge; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.TransactionHash; +import net.helix.pendulum.network.TransactionRequester; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.storage.Tangle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; -import static net.helix.hlx.controllers.TransactionViewModel.*; +import static net.helix.pendulum.controllers.TransactionViewModel.*; public class TransactionValidator { private static final Logger log = LoggerFactory.getLogger(TransactionValidator.class); diff --git a/src/main/java/net/helix/hlx/XI.java b/src/main/java/net/helix/pendulum/XI.java similarity index 96% rename from src/main/java/net/helix/hlx/XI.java rename to src/main/java/net/helix/pendulum/XI.java index 23e21a0f..ec165f98 100644 --- a/src/main/java/net/helix/hlx/XI.java +++ b/src/main/java/net/helix/pendulum/XI.java @@ -1,11 +1,11 @@ -package net.helix.hlx; +package net.helix.pendulum; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.sun.nio.file.SensitivityWatchEventModifier; -import net.helix.hlx.service.CallableRequest; -import net.helix.hlx.service.dto.AbstractResponse; -import net.helix.hlx.service.dto.ErrorResponse; +import net.helix.pendulum.service.CallableRequest; +import net.helix.pendulum.service.dto.AbstractResponse; +import net.helix.pendulum.service.dto.ErrorResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,14 +48,14 @@ public class XI { private Path rootPath; private boolean shutdown = false; - private final Helix helix; + private final Pendulum pendulum; public XI() { - helix = null; + pendulum = null; } - public XI(Helix helix) { - this.helix = helix; + public XI(Pendulum pendulum) { + this.pendulum = pendulum; } public void init(String rootDir) throws IOException { @@ -256,7 +256,7 @@ private void attach(Path pathToMain, String moduleName) { Bindings bindings = scriptEngine.createBindings(); bindings.put("API", xiMap); bindings.put("XICycle", startStop); - bindings.put("HELIX", helix); + bindings.put("HELIX", pendulum); xiAPI.put(moduleName, xiMap); xiLifetime.put(moduleName, startStop); diff --git a/src/main/java/net/helix/hlx/XiEvent.java b/src/main/java/net/helix/pendulum/XiEvent.java similarity index 95% rename from src/main/java/net/helix/hlx/XiEvent.java rename to src/main/java/net/helix/pendulum/XiEvent.java index 19f097ec..75a83c99 100644 --- a/src/main/java/net/helix/hlx/XiEvent.java +++ b/src/main/java/net/helix/pendulum/XiEvent.java @@ -1,4 +1,4 @@ -package net.helix.hlx; +package net.helix.pendulum; import java.util.Arrays; import java.util.Optional; diff --git a/src/main/java/net/helix/hlx/conf/APIConfig.java b/src/main/java/net/helix/pendulum/conf/APIConfig.java similarity index 98% rename from src/main/java/net/helix/hlx/conf/APIConfig.java rename to src/main/java/net/helix/pendulum/conf/APIConfig.java index d32e2a4d..ca114d2d 100644 --- a/src/main/java/net/helix/hlx/conf/APIConfig.java +++ b/src/main/java/net/helix/pendulum/conf/APIConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; import java.net.InetAddress; import java.util.List; diff --git a/src/main/java/net/helix/hlx/conf/BaseHelixConfig.java b/src/main/java/net/helix/pendulum/conf/BaseHelixConfig.java similarity index 99% rename from src/main/java/net/helix/hlx/conf/BaseHelixConfig.java rename to src/main/java/net/helix/pendulum/conf/BaseHelixConfig.java index 491f824b..94834300 100644 --- a/src/main/java/net/helix/hlx/conf/BaseHelixConfig.java +++ b/src/main/java/net/helix/pendulum/conf/BaseHelixConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; @@ -6,12 +6,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import net.helix.hlx.model.HashFactory; +import net.helix.pendulum.model.HashFactory; import org.apache.commons.lang3.ArrayUtils; -import net.helix.hlx.HLX; -import net.helix.hlx.utils.HelixUtils; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.Main; +import net.helix.pendulum.utils.HelixUtils; +import net.helix.pendulum.model.Hash; import java.net.InetAddress; import java.net.UnknownHostException; @@ -150,7 +150,7 @@ public JCommander parseConfigFromArgs(String[] args) throws ParameterException { .acceptUnknownOptions(true) .allowParameterOverwriting(true) //This is the first line of JCommander Usage - .programName("java -jar hlx-" + HLX.VERSION + ".jar") + .programName("java -jar hlx-" + Main.VERSION + ".jar") .build(); if (ArrayUtils.isNotEmpty(args)) { jCommander.parse(args); diff --git a/src/main/java/net/helix/hlx/conf/Config.java b/src/main/java/net/helix/pendulum/conf/Config.java similarity index 92% rename from src/main/java/net/helix/hlx/conf/Config.java rename to src/main/java/net/helix/pendulum/conf/Config.java index 50cedd52..5be42362 100644 --- a/src/main/java/net/helix/hlx/conf/Config.java +++ b/src/main/java/net/helix/pendulum/conf/Config.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; public interface Config { String TESTNET_FLAG = "--testnet"; diff --git a/src/main/java/net/helix/hlx/conf/ConfigFactory.java b/src/main/java/net/helix/pendulum/conf/ConfigFactory.java similarity index 94% rename from src/main/java/net/helix/hlx/conf/ConfigFactory.java rename to src/main/java/net/helix/pendulum/conf/ConfigFactory.java index 7eb60ab8..9417a006 100644 --- a/src/main/java/net/helix/hlx/conf/ConfigFactory.java +++ b/src/main/java/net/helix/pendulum/conf/ConfigFactory.java @@ -1,12 +1,12 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.module.SimpleModule; -import net.helix.hlx.conf.deserializers.CustomBoolDeserializer; -import net.helix.hlx.conf.deserializers.CustomStringDeserializer; +import net.helix.pendulum.conf.deserializers.CustomBoolDeserializer; +import net.helix.pendulum.conf.deserializers.CustomStringDeserializer; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/net/helix/hlx/conf/ConsensusConfig.java b/src/main/java/net/helix/pendulum/conf/ConsensusConfig.java similarity index 92% rename from src/main/java/net/helix/hlx/conf/ConsensusConfig.java rename to src/main/java/net/helix/pendulum/conf/ConsensusConfig.java index b84ce093..22234665 100644 --- a/src/main/java/net/helix/hlx/conf/ConsensusConfig.java +++ b/src/main/java/net/helix/pendulum/conf/ConsensusConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; /** * A configuration for all configuration concerned with achieving consensus on the ledger state across different nodes diff --git a/src/main/java/net/helix/hlx/conf/CuratorConfig.java b/src/main/java/net/helix/pendulum/conf/CuratorConfig.java similarity index 96% rename from src/main/java/net/helix/hlx/conf/CuratorConfig.java rename to src/main/java/net/helix/pendulum/conf/CuratorConfig.java index 55891a91..e32beef0 100644 --- a/src/main/java/net/helix/hlx/conf/CuratorConfig.java +++ b/src/main/java/net/helix/pendulum/conf/CuratorConfig.java @@ -1,6 +1,6 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; /** * Configs that should be used for tracking candidate applications and publishing nominees diff --git a/src/main/java/net/helix/hlx/conf/GraphConfig.java b/src/main/java/net/helix/pendulum/conf/GraphConfig.java similarity index 83% rename from src/main/java/net/helix/hlx/conf/GraphConfig.java rename to src/main/java/net/helix/pendulum/conf/GraphConfig.java index b0d8bd42..c52b06ff 100644 --- a/src/main/java/net/helix/hlx/conf/GraphConfig.java +++ b/src/main/java/net/helix/pendulum/conf/GraphConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; public interface GraphConfig extends Config{ boolean isGraphEnabled(); diff --git a/src/main/java/net/helix/hlx/conf/HelixConfig.java b/src/main/java/net/helix/pendulum/conf/HelixConfig.java similarity index 96% rename from src/main/java/net/helix/hlx/conf/HelixConfig.java rename to src/main/java/net/helix/pendulum/conf/HelixConfig.java index 08f2c710..8a3ffaae 100644 --- a/src/main/java/net/helix/hlx/conf/HelixConfig.java +++ b/src/main/java/net/helix/pendulum/conf/HelixConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; import com.beust.jcommander.JCommander; import com.beust.jcommander.ParameterException; diff --git a/src/main/java/net/helix/hlx/conf/LoggingConfig.java b/src/main/java/net/helix/pendulum/conf/LoggingConfig.java similarity index 95% rename from src/main/java/net/helix/hlx/conf/LoggingConfig.java rename to src/main/java/net/helix/pendulum/conf/LoggingConfig.java index a7d074e4..2e760dec 100644 --- a/src/main/java/net/helix/hlx/conf/LoggingConfig.java +++ b/src/main/java/net/helix/pendulum/conf/LoggingConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; public interface LoggingConfig extends Config { /** diff --git a/src/main/java/net/helix/hlx/conf/MainnetConfig.java b/src/main/java/net/helix/pendulum/conf/MainnetConfig.java similarity index 79% rename from src/main/java/net/helix/hlx/conf/MainnetConfig.java rename to src/main/java/net/helix/pendulum/conf/MainnetConfig.java index 50826dbd..74cc8081 100644 --- a/src/main/java/net/helix/hlx/conf/MainnetConfig.java +++ b/src/main/java/net/helix/pendulum/conf/MainnetConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; public class MainnetConfig extends BaseHelixConfig { @Override diff --git a/src/main/java/net/helix/hlx/conf/MilestoneConfig.java b/src/main/java/net/helix/pendulum/conf/MilestoneConfig.java similarity index 96% rename from src/main/java/net/helix/hlx/conf/MilestoneConfig.java rename to src/main/java/net/helix/pendulum/conf/MilestoneConfig.java index b3c714f0..34993ee1 100644 --- a/src/main/java/net/helix/hlx/conf/MilestoneConfig.java +++ b/src/main/java/net/helix/pendulum/conf/MilestoneConfig.java @@ -1,6 +1,6 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; import java.util.Set; diff --git a/src/main/java/net/helix/hlx/conf/NetworkConfig.java b/src/main/java/net/helix/pendulum/conf/NetworkConfig.java similarity index 98% rename from src/main/java/net/helix/hlx/conf/NetworkConfig.java rename to src/main/java/net/helix/pendulum/conf/NetworkConfig.java index f34382f5..5aad76fd 100644 --- a/src/main/java/net/helix/hlx/conf/NetworkConfig.java +++ b/src/main/java/net/helix/pendulum/conf/NetworkConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; import java.util.List; diff --git a/src/main/java/net/helix/hlx/conf/NodeConfig.java b/src/main/java/net/helix/pendulum/conf/NodeConfig.java similarity index 91% rename from src/main/java/net/helix/hlx/conf/NodeConfig.java rename to src/main/java/net/helix/pendulum/conf/NodeConfig.java index 89d3cec5..ae821853 100644 --- a/src/main/java/net/helix/hlx/conf/NodeConfig.java +++ b/src/main/java/net/helix/pendulum/conf/NodeConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; /** * A configuration that specifies how the node communicates with other nodes. diff --git a/src/main/java/net/helix/hlx/conf/PoWConfig.java b/src/main/java/net/helix/pendulum/conf/PoWConfig.java similarity index 90% rename from src/main/java/net/helix/hlx/conf/PoWConfig.java rename to src/main/java/net/helix/pendulum/conf/PoWConfig.java index 41f07a7e..d7fa0bc4 100644 --- a/src/main/java/net/helix/hlx/conf/PoWConfig.java +++ b/src/main/java/net/helix/pendulum/conf/PoWConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; public interface PoWConfig { /** diff --git a/src/main/java/net/helix/hlx/conf/ProtocolConfig.java b/src/main/java/net/helix/pendulum/conf/ProtocolConfig.java similarity index 98% rename from src/main/java/net/helix/hlx/conf/ProtocolConfig.java rename to src/main/java/net/helix/pendulum/conf/ProtocolConfig.java index 621c12a8..4e1091bd 100644 --- a/src/main/java/net/helix/hlx/conf/ProtocolConfig.java +++ b/src/main/java/net/helix/pendulum/conf/ProtocolConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; /** * Configuration for protocol rules. Controls what transactions will be accepted by the network, and how they will diff --git a/src/main/java/net/helix/hlx/conf/SnapshotConfig.java b/src/main/java/net/helix/pendulum/conf/SnapshotConfig.java similarity index 99% rename from src/main/java/net/helix/hlx/conf/SnapshotConfig.java rename to src/main/java/net/helix/pendulum/conf/SnapshotConfig.java index 77502414..df45c54d 100644 --- a/src/main/java/net/helix/hlx/conf/SnapshotConfig.java +++ b/src/main/java/net/helix/pendulum/conf/SnapshotConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; /** * Configurations for handling global snapshot data diff --git a/src/main/java/net/helix/hlx/conf/SolidificationConfig.java b/src/main/java/net/helix/pendulum/conf/SolidificationConfig.java similarity index 94% rename from src/main/java/net/helix/hlx/conf/SolidificationConfig.java rename to src/main/java/net/helix/pendulum/conf/SolidificationConfig.java index 76710b37..7b851136 100644 --- a/src/main/java/net/helix/hlx/conf/SolidificationConfig.java +++ b/src/main/java/net/helix/pendulum/conf/SolidificationConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; /** * diff --git a/src/main/java/net/helix/hlx/conf/SpamConfig.java b/src/main/java/net/helix/pendulum/conf/SpamConfig.java similarity index 86% rename from src/main/java/net/helix/hlx/conf/SpamConfig.java rename to src/main/java/net/helix/pendulum/conf/SpamConfig.java index cd599fb9..13488971 100644 --- a/src/main/java/net/helix/hlx/conf/SpamConfig.java +++ b/src/main/java/net/helix/pendulum/conf/SpamConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; public interface SpamConfig { /** diff --git a/src/main/java/net/helix/hlx/conf/TestnetConfig.java b/src/main/java/net/helix/pendulum/conf/TestnetConfig.java similarity index 98% rename from src/main/java/net/helix/hlx/conf/TestnetConfig.java rename to src/main/java/net/helix/pendulum/conf/TestnetConfig.java index 2c8acefc..65841de0 100644 --- a/src/main/java/net/helix/hlx/conf/TestnetConfig.java +++ b/src/main/java/net/helix/pendulum/conf/TestnetConfig.java @@ -1,11 +1,8 @@ -package net.helix.hlx.conf; - -import net.helix.hlx.model.Hash; +package net.helix.pendulum.conf; import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import com.fasterxml.jackson.annotation.JsonProperty; -import net.helix.hlx.model.HashFactory; import java.util.Objects; diff --git a/src/main/java/net/helix/hlx/conf/TipSelConfig.java b/src/main/java/net/helix/pendulum/conf/TipSelConfig.java similarity index 97% rename from src/main/java/net/helix/hlx/conf/TipSelConfig.java rename to src/main/java/net/helix/pendulum/conf/TipSelConfig.java index 801d3223..412b23bc 100644 --- a/src/main/java/net/helix/hlx/conf/TipSelConfig.java +++ b/src/main/java/net/helix/pendulum/conf/TipSelConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; /** * Configuration for how we perform tip selections. Tip selection is invoked when a client wants to find tips to diff --git a/src/main/java/net/helix/hlx/conf/XIConfig.java b/src/main/java/net/helix/pendulum/conf/XIConfig.java similarity index 90% rename from src/main/java/net/helix/hlx/conf/XIConfig.java rename to src/main/java/net/helix/pendulum/conf/XIConfig.java index f947ce25..aebbc73a 100644 --- a/src/main/java/net/helix/hlx/conf/XIConfig.java +++ b/src/main/java/net/helix/pendulum/conf/XIConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; /** * Configurations for XI modules diff --git a/src/main/java/net/helix/hlx/conf/ZMQConfig.java b/src/main/java/net/helix/pendulum/conf/ZMQConfig.java similarity index 97% rename from src/main/java/net/helix/hlx/conf/ZMQConfig.java rename to src/main/java/net/helix/pendulum/conf/ZMQConfig.java index e5222001..94e62644 100644 --- a/src/main/java/net/helix/hlx/conf/ZMQConfig.java +++ b/src/main/java/net/helix/pendulum/conf/ZMQConfig.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; public interface ZMQConfig extends Config { /** diff --git a/src/main/java/net/helix/hlx/conf/deserializers/CustomBoolDeserializer.java b/src/main/java/net/helix/pendulum/conf/deserializers/CustomBoolDeserializer.java similarity index 96% rename from src/main/java/net/helix/hlx/conf/deserializers/CustomBoolDeserializer.java rename to src/main/java/net/helix/pendulum/conf/deserializers/CustomBoolDeserializer.java index 6e289d23..66e17dce 100644 --- a/src/main/java/net/helix/hlx/conf/deserializers/CustomBoolDeserializer.java +++ b/src/main/java/net/helix/pendulum/conf/deserializers/CustomBoolDeserializer.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf.deserializers; +package net.helix.pendulum.conf.deserializers; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; diff --git a/src/main/java/net/helix/hlx/conf/deserializers/CustomStringDeserializer.java b/src/main/java/net/helix/pendulum/conf/deserializers/CustomStringDeserializer.java similarity index 94% rename from src/main/java/net/helix/hlx/conf/deserializers/CustomStringDeserializer.java rename to src/main/java/net/helix/pendulum/conf/deserializers/CustomStringDeserializer.java index 27049155..ebfb895c 100644 --- a/src/main/java/net/helix/hlx/conf/deserializers/CustomStringDeserializer.java +++ b/src/main/java/net/helix/pendulum/conf/deserializers/CustomStringDeserializer.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf.deserializers; +package net.helix.pendulum.conf.deserializers; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/net/helix/hlx/controllers/AddressViewModel.java b/src/main/java/net/helix/pendulum/controllers/AddressViewModel.java similarity index 90% rename from src/main/java/net/helix/hlx/controllers/AddressViewModel.java rename to src/main/java/net/helix/pendulum/controllers/AddressViewModel.java index 113a545b..cca014c6 100644 --- a/src/main/java/net/helix/hlx/controllers/AddressViewModel.java +++ b/src/main/java/net/helix/pendulum/controllers/AddressViewModel.java @@ -1,12 +1,12 @@ -package net.helix.hlx.controllers; +package net.helix.pendulum.controllers; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.AddressHash; -import net.helix.hlx.model.persistables.Address; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.Pair; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.AddressHash; +import net.helix.pendulum.model.persistables.Address; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.Pair; import java.util.Set; diff --git a/src/main/java/net/helix/hlx/controllers/ApproveeViewModel.java b/src/main/java/net/helix/pendulum/controllers/ApproveeViewModel.java similarity index 92% rename from src/main/java/net/helix/hlx/controllers/ApproveeViewModel.java rename to src/main/java/net/helix/pendulum/controllers/ApproveeViewModel.java index 3ff4a22e..0ff8111d 100644 --- a/src/main/java/net/helix/hlx/controllers/ApproveeViewModel.java +++ b/src/main/java/net/helix/pendulum/controllers/ApproveeViewModel.java @@ -1,12 +1,12 @@ -package net.helix.hlx.controllers; +package net.helix.pendulum.controllers; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.TransactionHash; -import net.helix.hlx.model.persistables.Approvee; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.Pair; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.TransactionHash; +import net.helix.pendulum.model.persistables.Approvee; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.Pair; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/net/helix/hlx/controllers/BundleViewModel.java b/src/main/java/net/helix/pendulum/controllers/BundleViewModel.java similarity index 92% rename from src/main/java/net/helix/hlx/controllers/BundleViewModel.java rename to src/main/java/net/helix/pendulum/controllers/BundleViewModel.java index 7d35e4fd..62b49381 100644 --- a/src/main/java/net/helix/hlx/controllers/BundleViewModel.java +++ b/src/main/java/net/helix/pendulum/controllers/BundleViewModel.java @@ -1,12 +1,12 @@ -package net.helix.hlx.controllers; - -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.BundleHash; -import net.helix.hlx.model.persistables.Bundle; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.Pair; +package net.helix.pendulum.controllers; + +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.BundleHash; +import net.helix.pendulum.model.persistables.Bundle; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.Pair; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/net/helix/hlx/controllers/HashesViewModel.java b/src/main/java/net/helix/pendulum/controllers/HashesViewModel.java similarity index 79% rename from src/main/java/net/helix/hlx/controllers/HashesViewModel.java rename to src/main/java/net/helix/pendulum/controllers/HashesViewModel.java index 9d1bb9cd..ceccae6c 100644 --- a/src/main/java/net/helix/hlx/controllers/HashesViewModel.java +++ b/src/main/java/net/helix/pendulum/controllers/HashesViewModel.java @@ -1,8 +1,8 @@ -package net.helix.hlx.controllers; +package net.helix.pendulum.controllers; -import net.helix.hlx.model.Hash; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Tangle; import java.util.Set; diff --git a/src/main/java/net/helix/hlx/controllers/RoundViewModel.java b/src/main/java/net/helix/pendulum/controllers/RoundViewModel.java similarity index 96% rename from src/main/java/net/helix/hlx/controllers/RoundViewModel.java rename to src/main/java/net/helix/pendulum/controllers/RoundViewModel.java index a53ed3c6..d094eaba 100644 --- a/src/main/java/net/helix/hlx/controllers/RoundViewModel.java +++ b/src/main/java/net/helix/pendulum/controllers/RoundViewModel.java @@ -1,17 +1,17 @@ -package net.helix.hlx.controllers; - -import net.helix.hlx.TransactionValidator; -import net.helix.hlx.crypto.Merkle; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.model.IntegerIndex; -import net.helix.hlx.model.persistables.Round; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.Pair; -import net.helix.hlx.utils.Serializer; +package net.helix.pendulum.controllers; + +import net.helix.pendulum.TransactionValidator; +import net.helix.pendulum.crypto.Merkle; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.model.IntegerIndex; +import net.helix.pendulum.model.persistables.Round; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.Pair; +import net.helix.pendulum.utils.Serializer; import java.util.*; import java.util.concurrent.ConcurrentHashMap; @@ -42,7 +42,7 @@ public static void clear() { /** * This method removes a {@link RoundViewModel} from the cache. * - * It is used by the {@link net.helix.hlx.service.transactionpruning.TransactionPruner} to remove rounds that + * It is used by the {@link net.helix.pendulum.service.transactionpruning.TransactionPruner} to remove rounds that * were deleted in the database, so that the runtime environment correctly reflects the database state. * * @param index the index of the round diff --git a/src/main/java/net/helix/hlx/controllers/StateDiffViewModel.java b/src/main/java/net/helix/pendulum/controllers/StateDiffViewModel.java similarity index 88% rename from src/main/java/net/helix/hlx/controllers/StateDiffViewModel.java rename to src/main/java/net/helix/pendulum/controllers/StateDiffViewModel.java index 91989dcf..7cf83dd7 100644 --- a/src/main/java/net/helix/hlx/controllers/StateDiffViewModel.java +++ b/src/main/java/net/helix/pendulum/controllers/StateDiffViewModel.java @@ -1,9 +1,9 @@ -package net.helix.hlx.controllers; +package net.helix.pendulum.controllers; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.IntegerIndex; -import net.helix.hlx.model.StateDiff; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.IntegerIndex; +import net.helix.pendulum.model.StateDiff; +import net.helix.pendulum.storage.Tangle; import java.util.Map; diff --git a/src/main/java/net/helix/hlx/controllers/TagViewModel.java b/src/main/java/net/helix/pendulum/controllers/TagViewModel.java similarity index 84% rename from src/main/java/net/helix/hlx/controllers/TagViewModel.java rename to src/main/java/net/helix/pendulum/controllers/TagViewModel.java index 5809e745..96ba30e9 100644 --- a/src/main/java/net/helix/hlx/controllers/TagViewModel.java +++ b/src/main/java/net/helix/pendulum/controllers/TagViewModel.java @@ -1,12 +1,12 @@ -package net.helix.hlx.controllers; +package net.helix.pendulum.controllers; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.TagHash; -import net.helix.hlx.model.persistables.Tag; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.Pair; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.TagHash; +import net.helix.pendulum.model.persistables.Tag; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.Pair; import java.util.HashMap; import java.util.Map; @@ -36,7 +36,7 @@ public static TagViewModel load(Tangle tangle, Indexable hash) throws Exception } public static TagViewModel loadBundleNonce(Tangle tangle, Indexable hash) throws Exception { - return load(tangle, hash, net.helix.hlx.model.persistables.BundleNonce.class); + return load(tangle, hash, net.helix.pendulum.model.persistables.BundleNonce.class); } public static Map.Entry getEntry(Hash hash, Hash hashToMerge) throws Exception { diff --git a/src/main/java/net/helix/hlx/controllers/TipsViewModel.java b/src/main/java/net/helix/pendulum/controllers/TipsViewModel.java similarity index 97% rename from src/main/java/net/helix/hlx/controllers/TipsViewModel.java rename to src/main/java/net/helix/pendulum/controllers/TipsViewModel.java index def2160a..76452a1a 100644 --- a/src/main/java/net/helix/hlx/controllers/TipsViewModel.java +++ b/src/main/java/net/helix/pendulum/controllers/TipsViewModel.java @@ -1,6 +1,6 @@ -package net.helix.hlx.controllers; +package net.helix.pendulum.controllers; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; import java.security.SecureRandom; import java.util.HashSet; @@ -10,7 +10,7 @@ /** * Acts as a controller interface for a Tips set. A tips set is a a First In First Out cache for - * {@link net.helix.hlx.model.persistables.Transaction} objects that have no children. Tips are stored in the + * {@link net.helix.pendulum.model.persistables.Transaction} objects that have no children. Tips are stored in the * {@link TipsViewModel} until they are deemed solid or are removed from the cache. */ public class TipsViewModel { diff --git a/src/main/java/net/helix/hlx/controllers/TransactionViewModel.java b/src/main/java/net/helix/pendulum/controllers/TransactionViewModel.java similarity index 98% rename from src/main/java/net/helix/hlx/controllers/TransactionViewModel.java rename to src/main/java/net/helix/pendulum/controllers/TransactionViewModel.java index 9a52beb2..fac2a4be 100644 --- a/src/main/java/net/helix/hlx/controllers/TransactionViewModel.java +++ b/src/main/java/net/helix/pendulum/controllers/TransactionViewModel.java @@ -1,14 +1,14 @@ -package net.helix.hlx.controllers; - -import net.helix.hlx.model.*; -import net.helix.hlx.model.persistables.*; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.snapshot.Snapshot; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.Converter; -import net.helix.hlx.utils.Pair; +package net.helix.pendulum.controllers; + +import net.helix.pendulum.model.*; +import net.helix.pendulum.model.persistables.*; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.snapshot.Snapshot; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.Converter; +import net.helix.pendulum.utils.Pair; import java.util.*; diff --git a/src/main/java/net/helix/hlx/crypto/GreedyMiner.java b/src/main/java/net/helix/pendulum/crypto/GreedyMiner.java similarity index 93% rename from src/main/java/net/helix/hlx/crypto/GreedyMiner.java rename to src/main/java/net/helix/pendulum/crypto/GreedyMiner.java index 79ea9978..f36bcd42 100644 --- a/src/main/java/net/helix/hlx/crypto/GreedyMiner.java +++ b/src/main/java/net/helix/pendulum/crypto/GreedyMiner.java @@ -1,9 +1,8 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.utils.FastByteComparisons; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.utils.FastByteComparisons; import org.bouncycastle.util.BigIntegers; -import org.bouncycastle.util.encoders.Hex; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,7 +11,7 @@ import java.util.ArrayList; import java.util.concurrent.atomic.AtomicReference; -import static net.helix.hlx.crypto.GreedyMiner.State.*; +import static net.helix.pendulum.crypto.GreedyMiner.State.*; /** * The Miner performs the proof-of-work needed for a valid block. diff --git a/src/main/java/net/helix/hlx/crypto/K256.java b/src/main/java/net/helix/pendulum/crypto/K256.java similarity index 88% rename from src/main/java/net/helix/hlx/crypto/K256.java rename to src/main/java/net/helix/pendulum/crypto/K256.java index b4810ebe..2c7df3dc 100644 --- a/src/main/java/net/helix/hlx/crypto/K256.java +++ b/src/main/java/net/helix/pendulum/crypto/K256.java @@ -1,9 +1,7 @@ -package net.helix.hlx.crypto; -import net.helix.hlx.exception.IllegalHashLengthException; -import net.helix.hlx.exception.ThrowableDigestException; +package net.helix.pendulum.crypto; +import net.helix.pendulum.exception.IllegalHashLengthException; +import net.helix.pendulum.exception.ThrowableDigestException; import org.bouncycastle.jcajce.provider.digest.Keccak; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.security.DigestException; diff --git a/src/main/java/net/helix/hlx/crypto/K512.java b/src/main/java/net/helix/pendulum/crypto/K512.java similarity index 88% rename from src/main/java/net/helix/hlx/crypto/K512.java rename to src/main/java/net/helix/pendulum/crypto/K512.java index 67e18fed..30933d1d 100644 --- a/src/main/java/net/helix/hlx/crypto/K512.java +++ b/src/main/java/net/helix/pendulum/crypto/K512.java @@ -1,10 +1,8 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; -import net.helix.hlx.exception.IllegalHashLengthException; -import net.helix.hlx.exception.ThrowableDigestException; +import net.helix.pendulum.exception.IllegalHashLengthException; +import net.helix.pendulum.exception.ThrowableDigestException; import org.bouncycastle.jcajce.provider.digest.Keccak; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.security.DigestException; diff --git a/src/main/java/net/helix/hlx/crypto/Merkle.java b/src/main/java/net/helix/pendulum/crypto/Merkle.java similarity index 97% rename from src/main/java/net/helix/hlx/crypto/Merkle.java rename to src/main/java/net/helix/pendulum/crypto/Merkle.java index bc390156..a93e49c2 100644 --- a/src/main/java/net/helix/hlx/crypto/Merkle.java +++ b/src/main/java/net/helix/pendulum/crypto/Merkle.java @@ -1,9 +1,9 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; import org.bouncycastle.util.encoders.Hex; import java.io.BufferedWriter; diff --git a/src/main/java/net/helix/hlx/crypto/Miner.java b/src/main/java/net/helix/pendulum/crypto/Miner.java similarity index 94% rename from src/main/java/net/helix/hlx/crypto/Miner.java rename to src/main/java/net/helix/pendulum/crypto/Miner.java index a3113817..dbe78538 100644 --- a/src/main/java/net/helix/hlx/crypto/Miner.java +++ b/src/main/java/net/helix/pendulum/crypto/Miner.java @@ -1,7 +1,7 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.utils.FastByteComparisons; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.utils.FastByteComparisons; import org.bouncycastle.util.BigIntegers; import org.bouncycastle.util.encoders.Hex; import org.slf4j.Logger; diff --git a/src/main/java/net/helix/hlx/crypto/Sha3.java b/src/main/java/net/helix/pendulum/crypto/Sha3.java similarity index 90% rename from src/main/java/net/helix/hlx/crypto/Sha3.java rename to src/main/java/net/helix/pendulum/crypto/Sha3.java index 471646bc..1ff17b5c 100644 --- a/src/main/java/net/helix/hlx/crypto/Sha3.java +++ b/src/main/java/net/helix/pendulum/crypto/Sha3.java @@ -1,15 +1,13 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; import java.security.DigestException; -import net.helix.hlx.exception.IllegalHashLengthException; -import net.helix.hlx.exception.ThrowableDigestException; +import net.helix.pendulum.exception.IllegalHashLengthException; +import net.helix.pendulum.exception.ThrowableDigestException; import org.bouncycastle.crypto.digests.SHA3Digest; import org.bouncycastle.jcajce.provider.digest.SHA3; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import net.helix.hlx.utils.FastByteComparisons; +import net.helix.pendulum.utils.FastByteComparisons; // Sha3-256 diff --git a/src/main/java/net/helix/hlx/crypto/Sha3_512.java b/src/main/java/net/helix/pendulum/crypto/Sha3_512.java similarity index 87% rename from src/main/java/net/helix/hlx/crypto/Sha3_512.java rename to src/main/java/net/helix/pendulum/crypto/Sha3_512.java index c8658989..01dc0d50 100644 --- a/src/main/java/net/helix/hlx/crypto/Sha3_512.java +++ b/src/main/java/net/helix/pendulum/crypto/Sha3_512.java @@ -1,15 +1,13 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; import java.security.DigestException; -import net.helix.hlx.exception.IllegalHashLengthException; -import net.helix.hlx.exception.ThrowableDigestException; +import net.helix.pendulum.exception.IllegalHashLengthException; +import net.helix.pendulum.exception.ThrowableDigestException; import org.bouncycastle.crypto.digests.SHA3Digest; import org.bouncycastle.jcajce.provider.digest.SHA3; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import net.helix.hlx.utils.FastByteComparisons; +import net.helix.pendulum.utils.FastByteComparisons; // Sha3-512 diff --git a/src/main/java/net/helix/hlx/crypto/Sponge.java b/src/main/java/net/helix/pendulum/crypto/Sponge.java similarity index 86% rename from src/main/java/net/helix/hlx/crypto/Sponge.java rename to src/main/java/net/helix/pendulum/crypto/Sponge.java index 64dc343d..76d9ccb2 100644 --- a/src/main/java/net/helix/hlx/crypto/Sponge.java +++ b/src/main/java/net/helix/pendulum/crypto/Sponge.java @@ -1,4 +1,4 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; public interface Sponge { int HASH_LENGTH = 32; diff --git a/src/main/java/net/helix/hlx/crypto/SpongeFactory.java b/src/main/java/net/helix/pendulum/crypto/SpongeFactory.java similarity index 92% rename from src/main/java/net/helix/hlx/crypto/SpongeFactory.java rename to src/main/java/net/helix/pendulum/crypto/SpongeFactory.java index c1f0eda1..4770e5d9 100644 --- a/src/main/java/net/helix/hlx/crypto/SpongeFactory.java +++ b/src/main/java/net/helix/pendulum/crypto/SpongeFactory.java @@ -1,4 +1,4 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; /** * Created by paul on 7/27/17. diff --git a/src/main/java/net/helix/hlx/crypto/Winternitz.java b/src/main/java/net/helix/pendulum/crypto/Winternitz.java similarity index 99% rename from src/main/java/net/helix/hlx/crypto/Winternitz.java rename to src/main/java/net/helix/pendulum/crypto/Winternitz.java index 4fa454e3..8e687912 100644 --- a/src/main/java/net/helix/hlx/crypto/Winternitz.java +++ b/src/main/java/net/helix/pendulum/crypto/Winternitz.java @@ -1,6 +1,6 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; -import net.helix.hlx.exception.IllegalHashLengthException; +import net.helix.pendulum.exception.IllegalHashLengthException; import java.util.Arrays; diff --git a/src/main/java/net/helix/hlx/exception/CouldNotObtainUnsafeInstanceException.java b/src/main/java/net/helix/pendulum/exception/CouldNotObtainUnsafeInstanceException.java similarity index 68% rename from src/main/java/net/helix/hlx/exception/CouldNotObtainUnsafeInstanceException.java rename to src/main/java/net/helix/pendulum/exception/CouldNotObtainUnsafeInstanceException.java index 8b8883d2..6053f66f 100644 --- a/src/main/java/net/helix/hlx/exception/CouldNotObtainUnsafeInstanceException.java +++ b/src/main/java/net/helix/pendulum/exception/CouldNotObtainUnsafeInstanceException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.exception; +package net.helix.pendulum.exception; public class CouldNotObtainUnsafeInstanceException extends RuntimeException { } diff --git a/src/main/java/net/helix/hlx/exception/IllegalHashLengthException.java b/src/main/java/net/helix/pendulum/exception/IllegalHashLengthException.java similarity index 80% rename from src/main/java/net/helix/hlx/exception/IllegalHashLengthException.java rename to src/main/java/net/helix/pendulum/exception/IllegalHashLengthException.java index 372a0497..3039086f 100644 --- a/src/main/java/net/helix/hlx/exception/IllegalHashLengthException.java +++ b/src/main/java/net/helix/pendulum/exception/IllegalHashLengthException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.exception; +package net.helix.pendulum.exception; public class IllegalHashLengthException extends RuntimeException { public IllegalHashLengthException(String message) { diff --git a/src/main/java/net/helix/hlx/exception/ThrowableDigestException.java b/src/main/java/net/helix/pendulum/exception/ThrowableDigestException.java similarity index 79% rename from src/main/java/net/helix/hlx/exception/ThrowableDigestException.java rename to src/main/java/net/helix/pendulum/exception/ThrowableDigestException.java index 679b0e5c..6284a420 100644 --- a/src/main/java/net/helix/hlx/exception/ThrowableDigestException.java +++ b/src/main/java/net/helix/pendulum/exception/ThrowableDigestException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.exception; +package net.helix.pendulum.exception; public class ThrowableDigestException extends RuntimeException { public ThrowableDigestException(Throwable cause) { diff --git a/src/main/java/net/helix/hlx/model/AbstractHash.java b/src/main/java/net/helix/pendulum/model/AbstractHash.java similarity index 96% rename from src/main/java/net/helix/hlx/model/AbstractHash.java rename to src/main/java/net/helix/pendulum/model/AbstractHash.java index f0421e96..74e583bf 100644 --- a/src/main/java/net/helix/hlx/model/AbstractHash.java +++ b/src/main/java/net/helix/pendulum/model/AbstractHash.java @@ -1,13 +1,13 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; import java.io.Serializable; import java.util.Arrays; import org.bouncycastle.util.encoders.Hex; -import net.helix.hlx.utils.Converter; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.storage.Indexable; +import net.helix.pendulum.utils.Converter; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.storage.Indexable; /** diff --git a/src/main/java/net/helix/hlx/model/AddressHash.java b/src/main/java/net/helix/pendulum/model/AddressHash.java similarity index 89% rename from src/main/java/net/helix/hlx/model/AddressHash.java rename to src/main/java/net/helix/pendulum/model/AddressHash.java index 29e3b5e8..0444d5fc 100644 --- a/src/main/java/net/helix/hlx/model/AddressHash.java +++ b/src/main/java/net/helix/pendulum/model/AddressHash.java @@ -1,4 +1,4 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; public class AddressHash extends AbstractHash { diff --git a/src/main/java/net/helix/hlx/model/BundleHash.java b/src/main/java/net/helix/pendulum/model/BundleHash.java similarity index 89% rename from src/main/java/net/helix/hlx/model/BundleHash.java rename to src/main/java/net/helix/pendulum/model/BundleHash.java index 3c6aeb53..17c61429 100644 --- a/src/main/java/net/helix/hlx/model/BundleHash.java +++ b/src/main/java/net/helix/pendulum/model/BundleHash.java @@ -1,4 +1,4 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; public class BundleHash extends AbstractHash { diff --git a/src/main/java/net/helix/hlx/model/BundleNonceHash.java b/src/main/java/net/helix/pendulum/model/BundleNonceHash.java similarity index 90% rename from src/main/java/net/helix/hlx/model/BundleNonceHash.java rename to src/main/java/net/helix/pendulum/model/BundleNonceHash.java index 3699a8e1..56ef35a6 100644 --- a/src/main/java/net/helix/hlx/model/BundleNonceHash.java +++ b/src/main/java/net/helix/pendulum/model/BundleNonceHash.java @@ -1,4 +1,4 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; public class BundleNonceHash extends AbstractHash { diff --git a/src/main/java/net/helix/hlx/model/Hash.java b/src/main/java/net/helix/pendulum/model/Hash.java similarity index 90% rename from src/main/java/net/helix/hlx/model/Hash.java rename to src/main/java/net/helix/pendulum/model/Hash.java index 81b79bbd..156738f2 100644 --- a/src/main/java/net/helix/hlx/model/Hash.java +++ b/src/main/java/net/helix/pendulum/model/Hash.java @@ -1,7 +1,7 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; -import net.helix.hlx.crypto.Sha3; -import net.helix.hlx.storage.Indexable; +import net.helix.pendulum.crypto.Sha3; +import net.helix.pendulum.storage.Indexable; /** diff --git a/src/main/java/net/helix/hlx/model/HashFactory.java b/src/main/java/net/helix/pendulum/model/HashFactory.java similarity index 96% rename from src/main/java/net/helix/hlx/model/HashFactory.java rename to src/main/java/net/helix/pendulum/model/HashFactory.java index 0c952c94..a9ba9be3 100644 --- a/src/main/java/net/helix/hlx/model/HashFactory.java +++ b/src/main/java/net/helix/pendulum/model/HashFactory.java @@ -1,7 +1,7 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; -import net.helix.hlx.model.persistables.*; -import net.helix.hlx.storage.Persistable; +import net.helix.pendulum.model.persistables.*; +import net.helix.pendulum.storage.Persistable; import org.bouncycastle.util.encoders.Hex; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/model/HashId.java b/src/main/java/net/helix/pendulum/model/HashId.java similarity index 83% rename from src/main/java/net/helix/hlx/model/HashId.java rename to src/main/java/net/helix/pendulum/model/HashId.java index c8738d83..bccf4b75 100644 --- a/src/main/java/net/helix/hlx/model/HashId.java +++ b/src/main/java/net/helix/pendulum/model/HashId.java @@ -1,4 +1,4 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; /** * Represents an ID of a transaction, address or bundle diff --git a/src/main/java/net/helix/hlx/model/HashPrefix.java b/src/main/java/net/helix/pendulum/model/HashPrefix.java similarity index 97% rename from src/main/java/net/helix/hlx/model/HashPrefix.java rename to src/main/java/net/helix/pendulum/model/HashPrefix.java index 483f6cbb..ffe36ad6 100644 --- a/src/main/java/net/helix/hlx/model/HashPrefix.java +++ b/src/main/java/net/helix/pendulum/model/HashPrefix.java @@ -1,4 +1,4 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; import java.util.Arrays; /** diff --git a/src/main/java/net/helix/hlx/model/IntegerIndex.java b/src/main/java/net/helix/pendulum/model/IntegerIndex.java similarity index 91% rename from src/main/java/net/helix/hlx/model/IntegerIndex.java rename to src/main/java/net/helix/pendulum/model/IntegerIndex.java index b5e28561..e62eea05 100644 --- a/src/main/java/net/helix/hlx/model/IntegerIndex.java +++ b/src/main/java/net/helix/pendulum/model/IntegerIndex.java @@ -1,7 +1,7 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.utils.Serializer; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.utils.Serializer; /** * Created by paul on 5/6/17. diff --git a/src/main/java/net/helix/hlx/model/StateDiff.java b/src/main/java/net/helix/pendulum/model/StateDiff.java similarity index 91% rename from src/main/java/net/helix/hlx/model/StateDiff.java rename to src/main/java/net/helix/pendulum/model/StateDiff.java index 41812a25..d1747ea2 100644 --- a/src/main/java/net/helix/hlx/model/StateDiff.java +++ b/src/main/java/net/helix/pendulum/model/StateDiff.java @@ -1,7 +1,7 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.utils.Serializer; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.utils.Serializer; import org.apache.commons.lang3.ArrayUtils; import java.util.Arrays; diff --git a/src/main/java/net/helix/hlx/model/TagHash.java b/src/main/java/net/helix/pendulum/model/TagHash.java similarity index 69% rename from src/main/java/net/helix/hlx/model/TagHash.java rename to src/main/java/net/helix/pendulum/model/TagHash.java index 32af3017..c3efffdf 100644 --- a/src/main/java/net/helix/hlx/model/TagHash.java +++ b/src/main/java/net/helix/pendulum/model/TagHash.java @@ -1,6 +1,6 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; -import static net.helix.hlx.controllers.TransactionViewModel.TAG_SIZE; +import static net.helix.pendulum.controllers.TransactionViewModel.TAG_SIZE; public class TagHash extends AbstractHash { diff --git a/src/main/java/net/helix/hlx/model/TransactionHash.java b/src/main/java/net/helix/pendulum/model/TransactionHash.java similarity index 95% rename from src/main/java/net/helix/hlx/model/TransactionHash.java rename to src/main/java/net/helix/pendulum/model/TransactionHash.java index fbd3c086..97087407 100644 --- a/src/main/java/net/helix/hlx/model/TransactionHash.java +++ b/src/main/java/net/helix/pendulum/model/TransactionHash.java @@ -1,7 +1,7 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; -import net.helix.hlx.crypto.Sponge; -import net.helix.hlx.crypto.SpongeFactory; +import net.helix.pendulum.crypto.Sponge; +import net.helix.pendulum.crypto.SpongeFactory; import org.bouncycastle.util.encoders.Hex; public class TransactionHash extends AbstractHash { diff --git a/src/main/java/net/helix/hlx/model/persistables/Address.java b/src/main/java/net/helix/pendulum/model/persistables/Address.java similarity index 77% rename from src/main/java/net/helix/hlx/model/persistables/Address.java rename to src/main/java/net/helix/pendulum/model/persistables/Address.java index cf2a9464..44d4edc0 100644 --- a/src/main/java/net/helix/hlx/model/persistables/Address.java +++ b/src/main/java/net/helix/pendulum/model/persistables/Address.java @@ -1,10 +1,10 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; /** * Created by paul on 5/15/17. */ -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; /** * Address model class is based on Hashes . diff --git a/src/main/java/net/helix/hlx/model/persistables/Approvee.java b/src/main/java/net/helix/pendulum/model/persistables/Approvee.java similarity index 78% rename from src/main/java/net/helix/hlx/model/persistables/Approvee.java rename to src/main/java/net/helix/pendulum/model/persistables/Approvee.java index d6673f50..72fadaa0 100644 --- a/src/main/java/net/helix/hlx/model/persistables/Approvee.java +++ b/src/main/java/net/helix/pendulum/model/persistables/Approvee.java @@ -1,10 +1,10 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; /** * Created by paul on 5/15/17. */ -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; /** * Approvee model class based on Hashes . diff --git a/src/main/java/net/helix/hlx/model/persistables/Bundle.java b/src/main/java/net/helix/pendulum/model/persistables/Bundle.java similarity index 78% rename from src/main/java/net/helix/hlx/model/persistables/Bundle.java rename to src/main/java/net/helix/pendulum/model/persistables/Bundle.java index 61873d3c..a775efa4 100644 --- a/src/main/java/net/helix/hlx/model/persistables/Bundle.java +++ b/src/main/java/net/helix/pendulum/model/persistables/Bundle.java @@ -1,10 +1,10 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; /** * Created by paul on 5/15/17. */ -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; /** * The Bundle model class is based on Hashes . diff --git a/src/main/java/net/helix/hlx/model/persistables/BundleNonce.java b/src/main/java/net/helix/pendulum/model/persistables/BundleNonce.java similarity index 70% rename from src/main/java/net/helix/hlx/model/persistables/BundleNonce.java rename to src/main/java/net/helix/pendulum/model/persistables/BundleNonce.java index d79ba185..2cfc8a71 100644 --- a/src/main/java/net/helix/hlx/model/persistables/BundleNonce.java +++ b/src/main/java/net/helix/pendulum/model/persistables/BundleNonce.java @@ -1,6 +1,6 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; public class BundleNonce extends Tag { diff --git a/src/main/java/net/helix/hlx/model/persistables/Hashes.java b/src/main/java/net/helix/pendulum/model/persistables/Hashes.java similarity index 92% rename from src/main/java/net/helix/hlx/model/persistables/Hashes.java rename to src/main/java/net/helix/pendulum/model/persistables/Hashes.java index 82943edc..233a5c73 100644 --- a/src/main/java/net/helix/hlx/model/persistables/Hashes.java +++ b/src/main/java/net/helix/pendulum/model/persistables/Hashes.java @@ -1,8 +1,8 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.storage.Persistable; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.storage.Persistable; import org.apache.commons.lang3.ArrayUtils; import java.util.LinkedHashSet; diff --git a/src/main/java/net/helix/hlx/model/persistables/Milestone.java b/src/main/java/net/helix/pendulum/model/persistables/Milestone.java similarity index 79% rename from src/main/java/net/helix/hlx/model/persistables/Milestone.java rename to src/main/java/net/helix/pendulum/model/persistables/Milestone.java index 9e84c837..d2bd4bb7 100644 --- a/src/main/java/net/helix/hlx/model/persistables/Milestone.java +++ b/src/main/java/net/helix/pendulum/model/persistables/Milestone.java @@ -1,10 +1,10 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.model.IntegerIndex; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.utils.Serializer; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.model.IntegerIndex; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.utils.Serializer; import org.apache.commons.lang3.ArrayUtils; /** diff --git a/src/main/java/net/helix/hlx/model/persistables/Round.java b/src/main/java/net/helix/pendulum/model/persistables/Round.java similarity index 79% rename from src/main/java/net/helix/hlx/model/persistables/Round.java rename to src/main/java/net/helix/pendulum/model/persistables/Round.java index 3b35f688..a8482e91 100644 --- a/src/main/java/net/helix/hlx/model/persistables/Round.java +++ b/src/main/java/net/helix/pendulum/model/persistables/Round.java @@ -1,7 +1,7 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; -import net.helix.hlx.model.IntegerIndex; -import net.helix.hlx.utils.Serializer; +import net.helix.pendulum.model.IntegerIndex; +import net.helix.pendulum.utils.Serializer; import org.apache.commons.lang3.ArrayUtils; diff --git a/src/main/java/net/helix/hlx/model/persistables/SpentAddress.java b/src/main/java/net/helix/pendulum/model/persistables/SpentAddress.java similarity index 85% rename from src/main/java/net/helix/hlx/model/persistables/SpentAddress.java rename to src/main/java/net/helix/pendulum/model/persistables/SpentAddress.java index c969f9b5..e37da083 100644 --- a/src/main/java/net/helix/hlx/model/persistables/SpentAddress.java +++ b/src/main/java/net/helix/pendulum/model/persistables/SpentAddress.java @@ -1,6 +1,6 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; -import net.helix.hlx.storage.Persistable; +import net.helix.pendulum.storage.Persistable; public class SpentAddress implements Persistable { private boolean exists = false; diff --git a/src/main/java/net/helix/hlx/model/persistables/Tag.java b/src/main/java/net/helix/pendulum/model/persistables/Tag.java similarity index 77% rename from src/main/java/net/helix/hlx/model/persistables/Tag.java rename to src/main/java/net/helix/pendulum/model/persistables/Tag.java index e74fde07..636f45fe 100644 --- a/src/main/java/net/helix/hlx/model/persistables/Tag.java +++ b/src/main/java/net/helix/pendulum/model/persistables/Tag.java @@ -1,10 +1,10 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; /** * Created by paul on 5/15/17. */ -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; /** * The Tag model class is based on Hashes . diff --git a/src/main/java/net/helix/hlx/model/persistables/Transaction.java b/src/main/java/net/helix/pendulum/model/persistables/Transaction.java similarity index 95% rename from src/main/java/net/helix/hlx/model/persistables/Transaction.java rename to src/main/java/net/helix/pendulum/model/persistables/Transaction.java index b72d1d21..c39d6660 100644 --- a/src/main/java/net/helix/hlx/model/persistables/Transaction.java +++ b/src/main/java/net/helix/pendulum/model/persistables/Transaction.java @@ -1,15 +1,15 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.utils.Serializer; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.utils.Serializer; import org.bouncycastle.util.encoders.Hex; import java.nio.ByteBuffer; -import static net.helix.hlx.controllers.TransactionViewModel.TAG_SIZE; +import static net.helix.pendulum.controllers.TransactionViewModel.TAG_SIZE; /** * Created by paul on 3/2/17 for hlx. diff --git a/src/main/java/net/helix/hlx/network/Neighbor.java b/src/main/java/net/helix/pendulum/network/Neighbor.java similarity index 98% rename from src/main/java/net/helix/hlx/network/Neighbor.java rename to src/main/java/net/helix/pendulum/network/Neighbor.java index 85885ec1..ef972227 100644 --- a/src/main/java/net/helix/hlx/network/Neighbor.java +++ b/src/main/java/net/helix/pendulum/network/Neighbor.java @@ -1,4 +1,4 @@ -package net.helix.hlx.network; +package net.helix.pendulum.network; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/net/helix/hlx/network/Node.java b/src/main/java/net/helix/pendulum/network/Node.java similarity index 98% rename from src/main/java/net/helix/hlx/network/Node.java rename to src/main/java/net/helix/pendulum/network/Node.java index 3bf81987..560c1b69 100644 --- a/src/main/java/net/helix/hlx/network/Node.java +++ b/src/main/java/net/helix/pendulum/network/Node.java @@ -1,21 +1,21 @@ -package net.helix.hlx.network; +package net.helix.pendulum.network; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import net.helix.hlx.TransactionValidator; -import net.helix.hlx.conf.NodeConfig; -import net.helix.hlx.controllers.BundleViewModel; -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.model.TransactionHash; -import net.helix.hlx.service.Graphstream; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.TransactionValidator; +import net.helix.pendulum.conf.NodeConfig; +import net.helix.pendulum.controllers.BundleViewModel; +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.model.TransactionHash; +import net.helix.pendulum.service.Graphstream; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.storage.Tangle; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; diff --git a/src/main/java/net/helix/hlx/network/TCPNeighbor.java b/src/main/java/net/helix/pendulum/network/TCPNeighbor.java similarity index 98% rename from src/main/java/net/helix/hlx/network/TCPNeighbor.java rename to src/main/java/net/helix/pendulum/network/TCPNeighbor.java index 9ede3f01..e5683078 100644 --- a/src/main/java/net/helix/hlx/network/TCPNeighbor.java +++ b/src/main/java/net/helix/pendulum/network/TCPNeighbor.java @@ -1,4 +1,4 @@ -package net.helix.hlx.network; +package net.helix.pendulum.network; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/network/TransactionRequester.java b/src/main/java/net/helix/pendulum/network/TransactionRequester.java similarity index 96% rename from src/main/java/net/helix/hlx/network/TransactionRequester.java rename to src/main/java/net/helix/pendulum/network/TransactionRequester.java index 5d2ef213..de522101 100644 --- a/src/main/java/net/helix/hlx/network/TransactionRequester.java +++ b/src/main/java/net/helix/pendulum/network/TransactionRequester.java @@ -1,9 +1,9 @@ -package net.helix.hlx.network; +package net.helix.pendulum.network; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.storage.Tangle; import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/network/TransactionRequesterWorker.java b/src/main/java/net/helix/pendulum/network/TransactionRequesterWorker.java similarity index 96% rename from src/main/java/net/helix/hlx/network/TransactionRequesterWorker.java rename to src/main/java/net/helix/pendulum/network/TransactionRequesterWorker.java index 6462c353..fb1e3e00 100644 --- a/src/main/java/net/helix/hlx/network/TransactionRequesterWorker.java +++ b/src/main/java/net/helix/pendulum/network/TransactionRequesterWorker.java @@ -1,4 +1,4 @@ -package net.helix.hlx.network; +package net.helix.pendulum.network; /** * Creates a background worker that tries to work through the request queue by sending random tips along the requested diff --git a/src/main/java/net/helix/hlx/network/UDPNeighbor.java b/src/main/java/net/helix/pendulum/network/UDPNeighbor.java similarity index 97% rename from src/main/java/net/helix/hlx/network/UDPNeighbor.java rename to src/main/java/net/helix/pendulum/network/UDPNeighbor.java index 6e50ec59..d16a1a85 100644 --- a/src/main/java/net/helix/hlx/network/UDPNeighbor.java +++ b/src/main/java/net/helix/pendulum/network/UDPNeighbor.java @@ -1,4 +1,4 @@ -package net.helix.hlx.network; +package net.helix.pendulum.network; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/network/UDPReceiver.java b/src/main/java/net/helix/pendulum/network/UDPReceiver.java similarity index 97% rename from src/main/java/net/helix/hlx/network/UDPReceiver.java rename to src/main/java/net/helix/pendulum/network/UDPReceiver.java index 78664d64..58f57689 100644 --- a/src/main/java/net/helix/hlx/network/UDPReceiver.java +++ b/src/main/java/net/helix/pendulum/network/UDPReceiver.java @@ -1,6 +1,6 @@ -package net.helix.hlx.network; +package net.helix.pendulum.network; -import net.helix.hlx.conf.NodeConfig; +import net.helix.pendulum.conf.NodeConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/network/impl/TransactionRequesterWorkerImpl.java b/src/main/java/net/helix/pendulum/network/impl/TransactionRequesterWorkerImpl.java similarity index 91% rename from src/main/java/net/helix/hlx/network/impl/TransactionRequesterWorkerImpl.java rename to src/main/java/net/helix/pendulum/network/impl/TransactionRequesterWorkerImpl.java index 8ac1a018..e165abe3 100644 --- a/src/main/java/net/helix/hlx/network/impl/TransactionRequesterWorkerImpl.java +++ b/src/main/java/net/helix/pendulum/network/impl/TransactionRequesterWorkerImpl.java @@ -1,15 +1,15 @@ -package net.helix.hlx.network.impl; - -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.network.Neighbor; -import net.helix.hlx.network.Node; -import net.helix.hlx.network.TransactionRequester; -import net.helix.hlx.network.TransactionRequesterWorker; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.thread.DedicatedScheduledExecutorService; -import net.helix.hlx.utils.thread.SilentScheduledExecutorService; +package net.helix.pendulum.network.impl; + +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.network.Neighbor; +import net.helix.pendulum.network.Node; +import net.helix.pendulum.network.TransactionRequester; +import net.helix.pendulum.network.TransactionRequesterWorker; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.thread.DedicatedScheduledExecutorService; +import net.helix.pendulum.utils.thread.SilentScheduledExecutorService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/network/replicator/Replicator.java b/src/main/java/net/helix/pendulum/network/replicator/Replicator.java similarity index 93% rename from src/main/java/net/helix/hlx/network/replicator/Replicator.java rename to src/main/java/net/helix/pendulum/network/replicator/Replicator.java index e2a7040f..31d0ab79 100644 --- a/src/main/java/net/helix/hlx/network/replicator/Replicator.java +++ b/src/main/java/net/helix/pendulum/network/replicator/Replicator.java @@ -1,7 +1,7 @@ -package net.helix.hlx.network.replicator; +package net.helix.pendulum.network.replicator; -import net.helix.hlx.conf.NodeConfig; -import net.helix.hlx.network.Node; +import net.helix.pendulum.conf.NodeConfig; +import net.helix.pendulum.network.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/network/replicator/ReplicatorSinkPool.java b/src/main/java/net/helix/pendulum/network/replicator/ReplicatorSinkPool.java similarity index 94% rename from src/main/java/net/helix/hlx/network/replicator/ReplicatorSinkPool.java rename to src/main/java/net/helix/pendulum/network/replicator/ReplicatorSinkPool.java index 89b38a96..a38535f6 100644 --- a/src/main/java/net/helix/hlx/network/replicator/ReplicatorSinkPool.java +++ b/src/main/java/net/helix/pendulum/network/replicator/ReplicatorSinkPool.java @@ -1,8 +1,8 @@ -package net.helix.hlx.network.replicator; +package net.helix.pendulum.network.replicator; -import net.helix.hlx.network.Neighbor; -import net.helix.hlx.network.Node; -import net.helix.hlx.network.TCPNeighbor; +import net.helix.pendulum.network.Neighbor; +import net.helix.pendulum.network.Node; +import net.helix.pendulum.network.TCPNeighbor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/network/replicator/ReplicatorSinkProcessor.java b/src/main/java/net/helix/pendulum/network/replicator/ReplicatorSinkProcessor.java similarity index 98% rename from src/main/java/net/helix/hlx/network/replicator/ReplicatorSinkProcessor.java rename to src/main/java/net/helix/pendulum/network/replicator/ReplicatorSinkProcessor.java index 548f49b1..6aed3742 100644 --- a/src/main/java/net/helix/hlx/network/replicator/ReplicatorSinkProcessor.java +++ b/src/main/java/net/helix/pendulum/network/replicator/ReplicatorSinkProcessor.java @@ -1,6 +1,6 @@ -package net.helix.hlx.network.replicator; +package net.helix.pendulum.network.replicator; -import net.helix.hlx.network.TCPNeighbor; +import net.helix.pendulum.network.TCPNeighbor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/network/replicator/ReplicatorSourcePool.java b/src/main/java/net/helix/pendulum/network/replicator/ReplicatorSourcePool.java similarity index 96% rename from src/main/java/net/helix/hlx/network/replicator/ReplicatorSourcePool.java rename to src/main/java/net/helix/pendulum/network/replicator/ReplicatorSourcePool.java index b28d21e3..59b85253 100644 --- a/src/main/java/net/helix/hlx/network/replicator/ReplicatorSourcePool.java +++ b/src/main/java/net/helix/pendulum/network/replicator/ReplicatorSourcePool.java @@ -1,6 +1,6 @@ -package net.helix.hlx.network.replicator; +package net.helix.pendulum.network.replicator; -import net.helix.hlx.network.Node; +import net.helix.pendulum.network.Node; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/network/replicator/ReplicatorSourceProcessor.java b/src/main/java/net/helix/pendulum/network/replicator/ReplicatorSourceProcessor.java similarity index 96% rename from src/main/java/net/helix/hlx/network/replicator/ReplicatorSourceProcessor.java rename to src/main/java/net/helix/pendulum/network/replicator/ReplicatorSourceProcessor.java index 25e58aa4..f3dd110a 100644 --- a/src/main/java/net/helix/hlx/network/replicator/ReplicatorSourceProcessor.java +++ b/src/main/java/net/helix/pendulum/network/replicator/ReplicatorSourceProcessor.java @@ -1,10 +1,10 @@ -package net.helix.hlx.network.replicator; +package net.helix.pendulum.network.replicator; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.conf.TestnetConfig; -import net.helix.hlx.network.Neighbor; -import net.helix.hlx.network.Node; -import net.helix.hlx.network.TCPNeighbor; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.conf.TestnetConfig; +import net.helix.pendulum.network.Neighbor; +import net.helix.pendulum.network.Node; +import net.helix.pendulum.network.TCPNeighbor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/service/API.java b/src/main/java/net/helix/pendulum/service/API.java similarity index 96% rename from src/main/java/net/helix/hlx/service/API.java rename to src/main/java/net/helix/pendulum/service/API.java index 496c3aa6..cee3f94c 100644 --- a/src/main/java/net/helix/hlx/service/API.java +++ b/src/main/java/net/helix/pendulum/service/API.java @@ -1,36 +1,36 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonSyntaxException; -import net.helix.hlx.BundleValidator; -import net.helix.hlx.HLX; -import net.helix.hlx.XI; -import net.helix.hlx.TransactionValidator; -import net.helix.hlx.conf.APIConfig; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.*; -import net.helix.hlx.crypto.*; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.network.Neighbor; -import net.helix.hlx.network.Node; -import net.helix.hlx.network.TransactionRequester; -import net.helix.hlx.service.curator.CandidateTracker; -import net.helix.hlx.service.dto.*; -import net.helix.hlx.service.ledger.LedgerService; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.nominee.NomineeTracker; -import net.helix.hlx.service.restserver.RestConnector; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.spentaddresses.SpentAddressesService; -import net.helix.hlx.service.tipselection.TipSelector; -import net.helix.hlx.service.tipselection.impl.WalkValidatorImpl; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.bundle.BundleTypes; -import net.helix.hlx.utils.bundle.BundleUtils; -import net.helix.hlx.utils.Serializer; +import net.helix.pendulum.BundleValidator; +import net.helix.pendulum.Main; +import net.helix.pendulum.XI; +import net.helix.pendulum.TransactionValidator; +import net.helix.pendulum.conf.APIConfig; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.*; +import net.helix.pendulum.crypto.*; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.network.Neighbor; +import net.helix.pendulum.network.Node; +import net.helix.pendulum.network.TransactionRequester; +import net.helix.pendulum.service.curator.CandidateTracker; +import net.helix.pendulum.service.dto.*; +import net.helix.pendulum.service.ledger.LedgerService; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.nominee.NomineeTracker; +import net.helix.pendulum.service.restserver.RestConnector; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.spentaddresses.SpentAddressesService; +import net.helix.pendulum.service.tipselection.TipSelector; +import net.helix.pendulum.service.tipselection.impl.WalkValidatorImpl; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.bundle.BundleTypes; +import net.helix.pendulum.utils.bundle.BundleUtils; +import net.helix.pendulum.utils.Serializer; import org.apache.commons.lang3.StringUtils; import org.bouncycastle.util.encoders.Hex; import org.slf4j.Logger; @@ -285,7 +285,7 @@ private AbstractResponse process(final String requestString, InetAddress netAddr * If an address has a pending transaction, it is also marked as spend. * * @param addresses List of addresses to check if they were ever spent from. - * @return {@link net.helix.hlx.service.dto.WereAddressesSpentFrom} + * @return {@link net.helix.pendulum.service.dto.WereAddressesSpentFrom} **/ private AbstractResponse wereAddressesSpentFromStatement(List addresses) throws Exception { final List addressesHash = addresses.stream() @@ -413,7 +413,7 @@ public boolean invalidSubtangleStatus() { * Returns the set of neighbors you are connected with, as well as their activity statistics (or counters). * The activity counters are reset after restarting IRI. * - * @return {@link net.helix.hlx.service.dto.GetNeighborsResponse} + * @return {@link net.helix.pendulum.service.dto.GetNeighborsResponse} **/ private AbstractResponse getNeighborsStatement() { return GetNeighborsResponse.create(node.getNeighbors()); @@ -429,7 +429,7 @@ private AbstractResponse getNeighborsStatement() { * udp://IPADDRESS:PORT * * @param uris list of neighbors to add - * @return {@link net.helix.hlx.service.dto.AddedNeighborsResponse} + * @return {@link net.helix.pendulum.service.dto.AddedNeighborsResponse} **/ private AbstractResponse addNeighborsStatement(final List uris) { int numberOfAddedNeighbors = 0; @@ -456,10 +456,10 @@ private AbstractResponse addNeighborsStatement(final List uris) { * The URI (Unique Resource Identification) for removing neighbors is: * udp://IPADDRESS:PORT * - * Returns an {@link net.helix.hlx.service.dto.ErrorResponse} if the URI scheme is wrong + * Returns an {@link net.helix.pendulum.service.dto.ErrorResponse} if the URI scheme is wrong * * @param uris The URIs of the neighbors we want to remove. - * @return {@link net.helix.hlx.service.dto.RemoveNeighborsResponse} + * @return {@link net.helix.pendulum.service.dto.RemoveNeighborsResponse} **/ private AbstractResponse removeNeighborsStatement(List uris) { int numberOfRemovedNeighbors = 0; @@ -508,7 +508,7 @@ private synchronized AbstractResponse getTransactionStringsStatement(List reference) { @@ -574,7 +574,7 @@ private void gatherStatisticsOnTipSelection() { /** * Returns all tips currently known by this node. * - * @return {@link net.helix.hlx.service.dto.GetTipsResponse} + * @return {@link net.helix.pendulum.service.dto.GetTipsResponse} **/ private synchronized AbstractResponse getTipsStatement() throws Exception { return GetTipsResponse.create(tipsViewModel.getTips() @@ -624,7 +624,7 @@ public void storeTransactionsStatement(final List txString) throws Excep /** * Interrupts and completely aborts the attachToTangle process. * - * @return {@link net.helix.hlx.service.dto.AbstractResponse.Emptyness} + * @return {@link net.helix.pendulum.service.dto.AbstractResponse.Emptyness} **/ private AbstractResponse interruptAttachingToTangleStatement(){ miner.cancel(); @@ -634,12 +634,12 @@ private AbstractResponse interruptAttachingToTangleStatement(){ /** * Returns information about this node. * - * @return {@link net.helix.hlx.service.dto.GetNodeInfoResponse} + * @return {@link net.helix.pendulum.service.dto.GetNodeInfoResponse} **/ private AbstractResponse getNodeInfoStatement() throws Exception { - String name = configuration.isTestnet() ? HLX.TESTNET_NAME : HLX.MAINNET_NAME; + String name = configuration.isTestnet() ? Main.TESTNET_NAME : Main.MAINNET_NAME; RoundViewModel round = RoundViewModel.first(tangle); - return GetNodeInfoResponse.create(name, HLX.VERSION, + return GetNodeInfoResponse.create(name, Main.VERSION, Runtime.getRuntime().availableProcessors(), Runtime.getRuntime().freeMemory(), System.getProperty("java.version"), @@ -681,11 +681,11 @@ private AbstractResponse getNodeAPIConfigurationStatement() { * This API call returns a list of boolean values in the same order as the submitted transactions.
    * Boolean values will be true for confirmed transactions, otherwise false. *

    - * Returns an {@link net.helix.hlx.service.dto.ErrorResponse} if a tip is missing or the subtangle is not solid + * Returns an {@link net.helix.pendulum.service.dto.ErrorResponse} if a tip is missing or the subtangle is not solid * * @param transactions List of transactions you want to get the inclusion state for. * @param tips List of tips (including milestones) you want to search for the inclusion state. - * @return {@link net.helix.hlx.service.dto.GetInclusionStatesResponse} + * @return {@link net.helix.pendulum.service.dto.GetInclusionStatesResponse} * @throws Exception When a transaction cannot be loaded from hash **/ private AbstractResponse getInclusionStatesStatement(final List transactions, final List tips) throws Exception { @@ -868,11 +868,11 @@ private boolean exhaustiveSearchWithinIndex( *

    * * Using multiple of these input fields returns the intersection of the values. - * Returns an {@link net.helix.hlx.service.dto.ErrorResponse} if more than maxFindTxs was found. + * Returns an {@link net.helix.pendulum.service.dto.ErrorResponse} if more than maxFindTxs was found. * * @param request The map with input fields * Must contain at least one of 'bundles', 'addresses', 'tags' or 'approvees'. - * @return {@link net.helix.hlx.service.dto.FindTransactionsResponse}. + * @return {@link net.helix.pendulum.service.dto.FindTransactionsResponse}. * @throws Exception If a model cannot be loaded, no valid input fields were supplied * or the total transactions to find exceeds {@link APIConfig#getMaxFindTransactions()}. **/ @@ -1025,7 +1025,7 @@ public void broadcastTransactionsStatement(final List txString) { * @param tips The optional tips to find the balance through. * @param threshold The confirmation threshold between 0 and 100(inclusive). * Should be set to 100 for getting balance by counting only confirmed transactions. - * @return {@link net.helix.hlx.service.dto.GetBalancesResponse} + * @return {@link net.helix.pendulum.service.dto.GetBalancesResponse} * @throws Exception When the database has encountered an error **/ private AbstractResponse getBalancesStatement(List addresses, diff --git a/src/main/java/net/helix/hlx/service/ApiArgs.java b/src/main/java/net/helix/pendulum/service/ApiArgs.java similarity index 75% rename from src/main/java/net/helix/hlx/service/ApiArgs.java rename to src/main/java/net/helix/pendulum/service/ApiArgs.java index 1a53eb62..78efce38 100644 --- a/src/main/java/net/helix/hlx/service/ApiArgs.java +++ b/src/main/java/net/helix/pendulum/service/ApiArgs.java @@ -1,21 +1,21 @@ -package net.helix.hlx.service; - -import net.helix.hlx.BundleValidator; -import net.helix.hlx.Helix; -import net.helix.hlx.TransactionValidator; -import net.helix.hlx.XI; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.network.Node; -import net.helix.hlx.network.TransactionRequester; -import net.helix.hlx.service.ledger.LedgerService; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.nominee.NomineeTracker; -import net.helix.hlx.service.curator.CandidateTracker; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.spentaddresses.SpentAddressesService; -import net.helix.hlx.service.tipselection.TipSelector; -import net.helix.hlx.storage.Tangle; +package net.helix.pendulum.service; + +import net.helix.pendulum.BundleValidator; +import net.helix.pendulum.Pendulum; +import net.helix.pendulum.TransactionValidator; +import net.helix.pendulum.XI; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.network.Node; +import net.helix.pendulum.network.TransactionRequester; +import net.helix.pendulum.service.ledger.LedgerService; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.nominee.NomineeTracker; +import net.helix.pendulum.service.curator.CandidateTracker; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.spentaddresses.SpentAddressesService; +import net.helix.pendulum.service.tipselection.TipSelector; +import net.helix.pendulum.storage.Tangle; public class ApiArgs { @@ -104,23 +104,23 @@ public ApiArgs(HelixConfig configuration) { this.configuration = configuration; } - public ApiArgs(Helix helix, XI xi) { - this.configuration = helix.configuration; + public ApiArgs(Pendulum pendulum, XI xi) { + this.configuration = pendulum.configuration; this.XI = xi; - this.transactionRequester = helix.transactionRequester; - this.spentAddressesService = helix.spentAddressesService; - this.tangle = helix.tangle; - this.bundleValidator = helix.bundleValidator; - this.snapshotProvider = helix.snapshotProvider; - this.ledgerService = helix.ledgerService; - this.node = helix.node; - this.tipsSelector = helix.tipsSelector; - this.tipsViewModel = helix.tipsViewModel; - this.transactionValidator = helix.transactionValidator; - this.latestMilestoneTracker = helix.latestMilestoneTracker; - this.candidateTracker = helix.candidateTracker; + this.transactionRequester = pendulum.transactionRequester; + this.spentAddressesService = pendulum.spentAddressesService; + this.tangle = pendulum.tangle; + this.bundleValidator = pendulum.bundleValidator; + this.snapshotProvider = pendulum.snapshotProvider; + this.ledgerService = pendulum.ledgerService; + this.node = pendulum.node; + this.tipsSelector = pendulum.tipsSelector; + this.tipsViewModel = pendulum.tipsViewModel; + this.transactionValidator = pendulum.transactionValidator; + this.latestMilestoneTracker = pendulum.latestMilestoneTracker; + this.candidateTracker = pendulum.candidateTracker; //this.nomineeTracker = helix.nomineeTracker; - this.graph = helix.graph; + this.graph = pendulum.graph; } public HelixConfig getConfiguration() { diff --git a/src/main/java/net/helix/hlx/service/ApiCommand.java b/src/main/java/net/helix/pendulum/service/ApiCommand.java similarity index 98% rename from src/main/java/net/helix/hlx/service/ApiCommand.java rename to src/main/java/net/helix/pendulum/service/ApiCommand.java index f977793a..4739ef78 100644 --- a/src/main/java/net/helix/hlx/service/ApiCommand.java +++ b/src/main/java/net/helix/pendulum/service/ApiCommand.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; /** * diff --git a/src/main/java/net/helix/hlx/service/CallableRequest.java b/src/main/java/net/helix/pendulum/service/CallableRequest.java similarity index 74% rename from src/main/java/net/helix/hlx/service/CallableRequest.java rename to src/main/java/net/helix/pendulum/service/CallableRequest.java index 149fa443..c006bfe5 100644 --- a/src/main/java/net/helix/hlx/service/CallableRequest.java +++ b/src/main/java/net/helix/pendulum/service/CallableRequest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; import java.util.Map; diff --git a/src/main/java/net/helix/hlx/service/Feature.java b/src/main/java/net/helix/pendulum/service/Feature.java similarity index 97% rename from src/main/java/net/helix/hlx/service/Feature.java rename to src/main/java/net/helix/pendulum/service/Feature.java index a90bcf22..362c6bf5 100644 --- a/src/main/java/net/helix/hlx/service/Feature.java +++ b/src/main/java/net/helix/pendulum/service/Feature.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; -import net.helix.hlx.conf.HelixConfig; +import net.helix.pendulum.conf.HelixConfig; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/net/helix/hlx/service/Graphstream.java b/src/main/java/net/helix/pendulum/service/Graphstream.java similarity index 98% rename from src/main/java/net/helix/hlx/service/Graphstream.java rename to src/main/java/net/helix/pendulum/service/Graphstream.java index 4ac28076..90a18250 100644 --- a/src/main/java/net/helix/hlx/service/Graphstream.java +++ b/src/main/java/net/helix/pendulum/service/Graphstream.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; import org.graphstream.graph.Graph; import org.graphstream.graph.Node; diff --git a/src/main/java/net/helix/hlx/service/RemoteAuth.java b/src/main/java/net/helix/pendulum/service/RemoteAuth.java similarity index 96% rename from src/main/java/net/helix/hlx/service/RemoteAuth.java rename to src/main/java/net/helix/pendulum/service/RemoteAuth.java index 8100b71c..1753629b 100644 --- a/src/main/java/net/helix/hlx/service/RemoteAuth.java +++ b/src/main/java/net/helix/pendulum/service/RemoteAuth.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/net/helix/hlx/service/Spammer.java b/src/main/java/net/helix/pendulum/service/Spammer.java similarity index 93% rename from src/main/java/net/helix/hlx/service/Spammer.java rename to src/main/java/net/helix/pendulum/service/Spammer.java index 848edfa9..b6fa132c 100644 --- a/src/main/java/net/helix/hlx/service/Spammer.java +++ b/src/main/java/net/helix/pendulum/service/Spammer.java @@ -1,7 +1,7 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; -import net.helix.hlx.conf.SpamConfig; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.conf.SpamConfig; +import net.helix.pendulum.model.Hash; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/service/TipsSolidifier.java b/src/main/java/net/helix/pendulum/service/TipsSolidifier.java similarity index 90% rename from src/main/java/net/helix/hlx/service/TipsSolidifier.java rename to src/main/java/net/helix/pendulum/service/TipsSolidifier.java index 7f62358c..617e8ce3 100644 --- a/src/main/java/net/helix/hlx/service/TipsSolidifier.java +++ b/src/main/java/net/helix/pendulum/service/TipsSolidifier.java @@ -1,11 +1,11 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; -import net.helix.hlx.TransactionValidator; -import net.helix.hlx.conf.SolidificationConfig; -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.TransactionValidator; +import net.helix.pendulum.conf.SolidificationConfig; +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.storage.Tangle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/service/ValidationException.java b/src/main/java/net/helix/pendulum/service/ValidationException.java similarity index 92% rename from src/main/java/net/helix/hlx/service/ValidationException.java rename to src/main/java/net/helix/pendulum/service/ValidationException.java index 1eeae78c..569f87dc 100644 --- a/src/main/java/net/helix/hlx/service/ValidationException.java +++ b/src/main/java/net/helix/pendulum/service/ValidationException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; public class ValidationException extends RuntimeException { diff --git a/src/main/java/net/helix/hlx/service/curator/CandidateSolidifier.java b/src/main/java/net/helix/pendulum/service/curator/CandidateSolidifier.java similarity index 92% rename from src/main/java/net/helix/hlx/service/curator/CandidateSolidifier.java rename to src/main/java/net/helix/pendulum/service/curator/CandidateSolidifier.java index a2d2dc17..05db2845 100755 --- a/src/main/java/net/helix/hlx/service/curator/CandidateSolidifier.java +++ b/src/main/java/net/helix/pendulum/service/curator/CandidateSolidifier.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.curator; +package net.helix.pendulum.service.curator; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; /** * This interface defines the contract for a manager that tries to solidify unsolid candidates by incorporating a diff --git a/src/main/java/net/helix/hlx/service/curator/CandidateTracker.java b/src/main/java/net/helix/pendulum/service/curator/CandidateTracker.java similarity index 90% rename from src/main/java/net/helix/hlx/service/curator/CandidateTracker.java rename to src/main/java/net/helix/pendulum/service/curator/CandidateTracker.java index bea903b8..28de162b 100755 --- a/src/main/java/net/helix/hlx/service/curator/CandidateTracker.java +++ b/src/main/java/net/helix/pendulum/service/curator/CandidateTracker.java @@ -1,8 +1,7 @@ -package net.helix.hlx.service.curator; +package net.helix.pendulum.service.curator; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; import java.util.Set; diff --git a/src/main/java/net/helix/hlx/service/curator/CandidateValidity.java b/src/main/java/net/helix/pendulum/service/curator/CandidateValidity.java similarity index 80% rename from src/main/java/net/helix/hlx/service/curator/CandidateValidity.java rename to src/main/java/net/helix/pendulum/service/curator/CandidateValidity.java index 519ac465..8bf08f66 100755 --- a/src/main/java/net/helix/hlx/service/curator/CandidateValidity.java +++ b/src/main/java/net/helix/pendulum/service/curator/CandidateValidity.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.curator; +package net.helix.pendulum.service.curator; /** * Validity states of candidate transactions that are used to express their "relevance" for the curator. diff --git a/src/main/java/net/helix/hlx/service/curator/CuratorException.java b/src/main/java/net/helix/pendulum/service/curator/CuratorException.java similarity index 96% rename from src/main/java/net/helix/hlx/service/curator/CuratorException.java rename to src/main/java/net/helix/pendulum/service/curator/CuratorException.java index 5d15b2b9..2bf06e77 100755 --- a/src/main/java/net/helix/hlx/service/curator/CuratorException.java +++ b/src/main/java/net/helix/pendulum/service/curator/CuratorException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.curator; +package net.helix.pendulum.service.curator; /** * This class is used to wrap exceptions that are specific to the curator logic. diff --git a/src/main/java/net/helix/hlx/service/curator/CuratorService.java b/src/main/java/net/helix/pendulum/service/curator/CuratorService.java similarity index 91% rename from src/main/java/net/helix/hlx/service/curator/CuratorService.java rename to src/main/java/net/helix/pendulum/service/curator/CuratorService.java index 1467ee77..9148542b 100755 --- a/src/main/java/net/helix/hlx/service/curator/CuratorService.java +++ b/src/main/java/net/helix/pendulum/service/curator/CuratorService.java @@ -1,8 +1,8 @@ -package net.helix.hlx.service.curator; +package net.helix.pendulum.service.curator; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; import java.util.Set; @@ -36,7 +36,7 @@ public interface CuratorService { *

    * We determine if the transaction was confirmed by examining its {@code snapshotIndex} value. For this method to * work we require that the previous candidates have been processed already (which is enforced by the {@link - * net.helix.hlx.service.curator.CandidateTracker} which applies the candidates in the order that they + * net.helix.pendulum.service.curator.CandidateTracker} which applies the candidates in the order that they * are issued by the coordinator). *

    * diff --git a/src/main/java/net/helix/hlx/service/curator/impl/CandidateSolidifierImpl.java b/src/main/java/net/helix/pendulum/service/curator/impl/CandidateSolidifierImpl.java similarity index 96% rename from src/main/java/net/helix/hlx/service/curator/impl/CandidateSolidifierImpl.java rename to src/main/java/net/helix/pendulum/service/curator/impl/CandidateSolidifierImpl.java index 163f8bc7..e7f9f6db 100755 --- a/src/main/java/net/helix/hlx/service/curator/impl/CandidateSolidifierImpl.java +++ b/src/main/java/net/helix/pendulum/service/curator/impl/CandidateSolidifierImpl.java @@ -1,12 +1,12 @@ -package net.helix.hlx.service.curator.impl; - -import net.helix.hlx.TransactionValidator; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.curator.CandidateSolidifier; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.utils.log.interval.IntervalLogger; -import net.helix.hlx.utils.thread.DedicatedScheduledExecutorService; -import net.helix.hlx.utils.thread.SilentScheduledExecutorService; +package net.helix.pendulum.service.curator.impl; + +import net.helix.pendulum.TransactionValidator; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.curator.CandidateSolidifier; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.utils.log.interval.IntervalLogger; +import net.helix.pendulum.utils.thread.DedicatedScheduledExecutorService; +import net.helix.pendulum.utils.thread.SilentScheduledExecutorService; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/net/helix/hlx/service/curator/impl/CandidateTrackerImpl.java b/src/main/java/net/helix/pendulum/service/curator/impl/CandidateTrackerImpl.java similarity index 92% rename from src/main/java/net/helix/hlx/service/curator/impl/CandidateTrackerImpl.java rename to src/main/java/net/helix/pendulum/service/curator/impl/CandidateTrackerImpl.java index 4211843f..f0e6d29f 100755 --- a/src/main/java/net/helix/hlx/service/curator/impl/CandidateTrackerImpl.java +++ b/src/main/java/net/helix/pendulum/service/curator/impl/CandidateTrackerImpl.java @@ -1,31 +1,24 @@ -package net.helix.hlx.service.curator.impl; - -import net.helix.hlx.BundleValidator; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.AddressViewModel; -import net.helix.hlx.controllers.BundleViewModel; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.Merkle; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.service.curator.*; -import net.helix.hlx.service.milestone.MilestoneSolidifier; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.utils.RoundIndexUtil; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.log.interval.IntervalLogger; -import net.helix.hlx.utils.thread.DedicatedScheduledExecutorService; -import net.helix.hlx.utils.thread.SilentScheduledExecutorService; +package net.helix.pendulum.service.curator.impl; + +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.AddressViewModel; +import net.helix.pendulum.controllers.BundleViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.service.curator.*; +import net.helix.pendulum.service.milestone.MilestoneSolidifier; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.utils.RoundIndexUtil; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.log.interval.IntervalLogger; +import net.helix.pendulum.utils.thread.DedicatedScheduledExecutorService; +import net.helix.pendulum.utils.thread.SilentScheduledExecutorService; import java.util.*; import java.util.concurrent.TimeUnit; -import static net.helix.hlx.service.curator.CandidateValidity.INCOMPLETE; -import static net.helix.hlx.service.curator.CandidateValidity.INVALID; -import static net.helix.hlx.service.curator.CandidateValidity.VALID; - /** * This class implements the CandidateTracker interface and is responsible for searching for applicants, * processing and validating their requests and adding / removing candidates to the set of nominees. diff --git a/src/main/java/net/helix/hlx/service/curator/impl/CuratorServiceImpl.java b/src/main/java/net/helix/pendulum/service/curator/impl/CuratorServiceImpl.java similarity index 89% rename from src/main/java/net/helix/hlx/service/curator/impl/CuratorServiceImpl.java rename to src/main/java/net/helix/pendulum/service/curator/impl/CuratorServiceImpl.java index ce8cb4ef..1bc9a019 100755 --- a/src/main/java/net/helix/hlx/service/curator/impl/CuratorServiceImpl.java +++ b/src/main/java/net/helix/pendulum/service/curator/impl/CuratorServiceImpl.java @@ -1,27 +1,26 @@ -package net.helix.hlx.service.curator.impl; - -import net.helix.hlx.BundleValidator; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.Merkle; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.curator.CandidateValidity; -import net.helix.hlx.service.curator.CuratorException; -import net.helix.hlx.service.curator.CuratorService; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.SnapshotService; -import net.helix.hlx.storage.Tangle; +package net.helix.pendulum.service.curator.impl; + +import net.helix.pendulum.BundleValidator; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.Merkle; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.curator.CandidateValidity; +import net.helix.pendulum.service.curator.CuratorException; +import net.helix.pendulum.service.curator.CuratorService; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.SnapshotService; +import net.helix.pendulum.storage.Tangle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.security.SecureRandom; import java.util.*; import java.util.stream.Collectors; -import static net.helix.hlx.service.curator.CandidateValidity.*; +import static net.helix.pendulum.service.curator.CandidateValidity.*; public class CuratorServiceImpl implements CuratorService { /** diff --git a/src/main/java/net/helix/hlx/service/curator/impl/NomineePublisher.java b/src/main/java/net/helix/pendulum/service/curator/impl/NomineePublisher.java similarity index 92% rename from src/main/java/net/helix/hlx/service/curator/impl/NomineePublisher.java rename to src/main/java/net/helix/pendulum/service/curator/impl/NomineePublisher.java index 96ad0bc1..00d1ae9e 100644 --- a/src/main/java/net/helix/hlx/service/curator/impl/NomineePublisher.java +++ b/src/main/java/net/helix/pendulum/service/curator/impl/NomineePublisher.java @@ -1,9 +1,7 @@ -package net.helix.hlx.service.curator.impl; +package net.helix.pendulum.service.curator.impl; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.API; -import net.helix.hlx.utils.bundle.BundleTypes; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.service.API; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/service/dto/AbstractResponse.java b/src/main/java/net/helix/pendulum/service/dto/AbstractResponse.java similarity index 97% rename from src/main/java/net/helix/hlx/service/dto/AbstractResponse.java rename to src/main/java/net/helix/pendulum/service/dto/AbstractResponse.java index 43ef0cfb..c0963c67 100644 --- a/src/main/java/net/helix/hlx/service/dto/AbstractResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/AbstractResponse.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/src/main/java/net/helix/hlx/service/dto/AccessLimitedResponse.java b/src/main/java/net/helix/pendulum/service/dto/AccessLimitedResponse.java similarity index 95% rename from src/main/java/net/helix/hlx/service/dto/AccessLimitedResponse.java rename to src/main/java/net/helix/pendulum/service/dto/AccessLimitedResponse.java index f7fb1ca1..33fd0507 100644 --- a/src/main/java/net/helix/hlx/service/dto/AccessLimitedResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/AccessLimitedResponse.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; /** * diff --git a/src/main/java/net/helix/hlx/service/dto/AddedNeighborsResponse.java b/src/main/java/net/helix/pendulum/service/dto/AddedNeighborsResponse.java similarity index 94% rename from src/main/java/net/helix/hlx/service/dto/AddedNeighborsResponse.java rename to src/main/java/net/helix/pendulum/service/dto/AddedNeighborsResponse.java index 8b3683a4..df7a429c 100644 --- a/src/main/java/net/helix/hlx/service/dto/AddedNeighborsResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/AddedNeighborsResponse.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; public class AddedNeighborsResponse extends AbstractResponse { diff --git a/src/main/java/net/helix/hlx/service/dto/AttachToTangleResponse.java b/src/main/java/net/helix/pendulum/service/dto/AttachToTangleResponse.java similarity index 92% rename from src/main/java/net/helix/hlx/service/dto/AttachToTangleResponse.java rename to src/main/java/net/helix/pendulum/service/dto/AttachToTangleResponse.java index 96fed0bb..8d528bd1 100644 --- a/src/main/java/net/helix/hlx/service/dto/AttachToTangleResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/AttachToTangleResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; import java.util.List; diff --git a/src/main/java/net/helix/hlx/service/dto/CheckConsistency.java b/src/main/java/net/helix/pendulum/service/dto/CheckConsistency.java similarity index 94% rename from src/main/java/net/helix/hlx/service/dto/CheckConsistency.java rename to src/main/java/net/helix/pendulum/service/dto/CheckConsistency.java index cd088174..329bcaaa 100644 --- a/src/main/java/net/helix/hlx/service/dto/CheckConsistency.java +++ b/src/main/java/net/helix/pendulum/service/dto/CheckConsistency.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; /** * diff --git a/src/main/java/net/helix/hlx/service/dto/ErrorResponse.java b/src/main/java/net/helix/pendulum/service/dto/ErrorResponse.java similarity index 90% rename from src/main/java/net/helix/hlx/service/dto/ErrorResponse.java rename to src/main/java/net/helix/pendulum/service/dto/ErrorResponse.java index f8585959..a7a22d75 100644 --- a/src/main/java/net/helix/hlx/service/dto/ErrorResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/ErrorResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; /** * This class represents the response the API returns when an error has occurred. diff --git a/src/main/java/net/helix/hlx/service/dto/ExceptionResponse.java b/src/main/java/net/helix/pendulum/service/dto/ExceptionResponse.java similarity index 91% rename from src/main/java/net/helix/hlx/service/dto/ExceptionResponse.java rename to src/main/java/net/helix/pendulum/service/dto/ExceptionResponse.java index d31806f1..d2e2a633 100644 --- a/src/main/java/net/helix/hlx/service/dto/ExceptionResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/ExceptionResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; /** * diff --git a/src/main/java/net/helix/hlx/service/dto/FindTransactionsResponse.java b/src/main/java/net/helix/pendulum/service/dto/FindTransactionsResponse.java similarity index 94% rename from src/main/java/net/helix/hlx/service/dto/FindTransactionsResponse.java rename to src/main/java/net/helix/pendulum/service/dto/FindTransactionsResponse.java index e770f7e0..fe35d4e4 100644 --- a/src/main/java/net/helix/hlx/service/dto/FindTransactionsResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/FindTransactionsResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; import java.util.List; diff --git a/src/main/java/net/helix/hlx/service/dto/GetBalancesResponse.java b/src/main/java/net/helix/pendulum/service/dto/GetBalancesResponse.java similarity index 95% rename from src/main/java/net/helix/hlx/service/dto/GetBalancesResponse.java rename to src/main/java/net/helix/pendulum/service/dto/GetBalancesResponse.java index c772d004..480854a8 100644 --- a/src/main/java/net/helix/hlx/service/dto/GetBalancesResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/GetBalancesResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; import java.util.List; diff --git a/src/main/java/net/helix/hlx/service/dto/GetInclusionStatesResponse.java b/src/main/java/net/helix/pendulum/service/dto/GetInclusionStatesResponse.java similarity index 92% rename from src/main/java/net/helix/hlx/service/dto/GetInclusionStatesResponse.java rename to src/main/java/net/helix/pendulum/service/dto/GetInclusionStatesResponse.java index 20ded5f8..4da4c791 100644 --- a/src/main/java/net/helix/hlx/service/dto/GetInclusionStatesResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/GetInclusionStatesResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; /** * diff --git a/src/main/java/net/helix/hlx/service/dto/GetNeighborsResponse.java b/src/main/java/net/helix/pendulum/service/dto/GetNeighborsResponse.java similarity index 90% rename from src/main/java/net/helix/hlx/service/dto/GetNeighborsResponse.java rename to src/main/java/net/helix/pendulum/service/dto/GetNeighborsResponse.java index e76cc168..256611fb 100644 --- a/src/main/java/net/helix/hlx/service/dto/GetNeighborsResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/GetNeighborsResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; import java.util.List; @@ -25,7 +25,7 @@ public class GetNeighborsResponse extends AbstractResponse { *
  • numberOfSentTransactions
    • *
  • numberOfStaleTransactions
    • * - * @see {@link net.helix.hlx.service.dto.GetNeighborsResponse.Neighbor} + * @see {@link net.helix.pendulum.service.dto.GetNeighborsResponse.Neighbor} */ private Neighbor[] neighbors; @@ -40,14 +40,14 @@ public Neighbor[] getNeighbors() { /** * Creates a new {@link GetNeighborsResponse} * - * @param elements {@link net.helix.hlx.network.Neighbor} + * @param elements {@link net.helix.pendulum.network.Neighbor} * @return an {@link GetNeighborsResponse} filled all neighbors and their activity. */ - public static AbstractResponse create(final List elements) { + public static AbstractResponse create(final List elements) { GetNeighborsResponse res = new GetNeighborsResponse(); res.neighbors = new Neighbor[elements.size()]; int i = 0; - for (net.helix.hlx.network.Neighbor n : elements) { + for (net.helix.pendulum.network.Neighbor n : elements) { res.neighbors[i++] = Neighbor.createFrom(n); } return res; @@ -139,7 +139,7 @@ public String getConnectionType() { * @param n the neighbor currently connected to this node * @return a new instance of {@link GetNeighborsResponse.Neighbor} */ - public static Neighbor createFrom(net.helix.hlx.network.Neighbor n) { + public static Neighbor createFrom(net.helix.pendulum.network.Neighbor n) { Neighbor ne = new Neighbor(); int port = n.getPort(); ne.address = n.getAddress().getHostString() + ":" + port; diff --git a/src/main/java/net/helix/hlx/service/dto/GetNodeAPIConfigurationResponse.java b/src/main/java/net/helix/pendulum/service/dto/GetNodeAPIConfigurationResponse.java similarity index 89% rename from src/main/java/net/helix/hlx/service/dto/GetNodeAPIConfigurationResponse.java rename to src/main/java/net/helix/pendulum/service/dto/GetNodeAPIConfigurationResponse.java index 1ed0d0d4..4703a585 100644 --- a/src/main/java/net/helix/hlx/service/dto/GetNodeAPIConfigurationResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/GetNodeAPIConfigurationResponse.java @@ -1,10 +1,10 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.conf.HelixConfig; +import net.helix.pendulum.conf.HelixConfig; /** - * Contains information about the result of a successful {@link net.helix.hlx.service.API#getNodeAPIConfigurationStatement()} API call. - * See {@link net.helix.hlx.service.API#getNodeAPIConfigurationStatement()} for how this response is created. + * Contains information about the result of a successful {@link net.helix.pendulum.service.API#getNodeAPIConfigurationStatement()} API call. + * See {@link net.helix.pendulum.service.API#getNodeAPIConfigurationStatement()} for how this response is created. */ public class GetNodeAPIConfigurationResponse extends AbstractResponse { private int maxFindTransactions; diff --git a/src/main/java/net/helix/hlx/service/dto/GetNodeInfoResponse.java b/src/main/java/net/helix/pendulum/service/dto/GetNodeInfoResponse.java similarity index 98% rename from src/main/java/net/helix/hlx/service/dto/GetNodeInfoResponse.java rename to src/main/java/net/helix/pendulum/service/dto/GetNodeInfoResponse.java index e821a153..d90bbe21 100644 --- a/src/main/java/net/helix/hlx/service/dto/GetNodeInfoResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/GetNodeInfoResponse.java @@ -1,8 +1,8 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.API; -import net.helix.hlx.service.Feature; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.API; +import net.helix.pendulum.service.Feature; import org.bouncycastle.util.encoders.Hex; /** diff --git a/src/main/java/net/helix/hlx/service/dto/GetTipsResponse.java b/src/main/java/net/helix/pendulum/service/dto/GetTipsResponse.java similarity index 90% rename from src/main/java/net/helix/hlx/service/dto/GetTipsResponse.java rename to src/main/java/net/helix/pendulum/service/dto/GetTipsResponse.java index e27ce9e7..499b6a65 100644 --- a/src/main/java/net/helix/hlx/service/dto/GetTipsResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/GetTipsResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; import java.util.List; diff --git a/src/main/java/net/helix/hlx/service/dto/GetTransactionStringsResponse.java b/src/main/java/net/helix/pendulum/service/dto/GetTransactionStringsResponse.java similarity index 88% rename from src/main/java/net/helix/hlx/service/dto/GetTransactionStringsResponse.java rename to src/main/java/net/helix/pendulum/service/dto/GetTransactionStringsResponse.java index 03ba02ce..86ed72e4 100644 --- a/src/main/java/net/helix/hlx/service/dto/GetTransactionStringsResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/GetTransactionStringsResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; import java.util.List; @@ -14,7 +14,7 @@ public class GetTransactionStringsResponse extends AbstractResponse { /** * The raw transaction data {txs} of the specified transactions. * These transaction hex strings can then be easily converted into the actual transaction object. - * See library functions as to how to transform back to a {@link net.helix.hlx.model.persistables.Transaction}. + * See library functions as to how to transform back to a {@link net.helix.pendulum.model.persistables.Transaction}. */ private String[] txs; diff --git a/src/main/java/net/helix/hlx/service/dto/GetTransactionsToApproveResponse.java b/src/main/java/net/helix/pendulum/service/dto/GetTransactionsToApproveResponse.java similarity index 92% rename from src/main/java/net/helix/hlx/service/dto/GetTransactionsToApproveResponse.java rename to src/main/java/net/helix/pendulum/service/dto/GetTransactionsToApproveResponse.java index 0a4af3dd..46ed1e18 100644 --- a/src/main/java/net/helix/hlx/service/dto/GetTransactionsToApproveResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/GetTransactionsToApproveResponse.java @@ -1,7 +1,7 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.API; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.API; import org.bouncycastle.util.encoders.Hex; /** diff --git a/src/main/java/net/helix/hlx/service/dto/RemoveNeighborsResponse.java b/src/main/java/net/helix/pendulum/service/dto/RemoveNeighborsResponse.java similarity index 92% rename from src/main/java/net/helix/hlx/service/dto/RemoveNeighborsResponse.java rename to src/main/java/net/helix/pendulum/service/dto/RemoveNeighborsResponse.java index bd18dfdc..4a3f8c96 100644 --- a/src/main/java/net/helix/hlx/service/dto/RemoveNeighborsResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/RemoveNeighborsResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; /** * diff --git a/src/main/java/net/helix/hlx/service/dto/WereAddressesSpentFrom.java b/src/main/java/net/helix/pendulum/service/dto/WereAddressesSpentFrom.java similarity index 92% rename from src/main/java/net/helix/hlx/service/dto/WereAddressesSpentFrom.java rename to src/main/java/net/helix/pendulum/service/dto/WereAddressesSpentFrom.java index 8abb62f7..1b52e4d0 100644 --- a/src/main/java/net/helix/hlx/service/dto/WereAddressesSpentFrom.java +++ b/src/main/java/net/helix/pendulum/service/dto/WereAddressesSpentFrom.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.service.API; +import net.helix.pendulum.service.API; /** * diff --git a/src/main/java/net/helix/hlx/service/dto/XIResponse.java b/src/main/java/net/helix/pendulum/service/dto/XIResponse.java similarity index 90% rename from src/main/java/net/helix/hlx/service/dto/XIResponse.java rename to src/main/java/net/helix/pendulum/service/dto/XIResponse.java index aea2bf05..99898787 100644 --- a/src/main/java/net/helix/hlx/service/dto/XIResponse.java +++ b/src/main/java/net/helix/pendulum/service/dto/XIResponse.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.dto; +package net.helix.pendulum.service.dto; -import net.helix.hlx.XI; +import net.helix.pendulum.XI; /** *

    diff --git a/src/main/java/net/helix/hlx/service/ledger/LedgerException.java b/src/main/java/net/helix/pendulum/service/ledger/LedgerException.java similarity index 96% rename from src/main/java/net/helix/hlx/service/ledger/LedgerException.java rename to src/main/java/net/helix/pendulum/service/ledger/LedgerException.java index ad24a58c..25a295e5 100644 --- a/src/main/java/net/helix/hlx/service/ledger/LedgerException.java +++ b/src/main/java/net/helix/pendulum/service/ledger/LedgerException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.ledger; +package net.helix.pendulum.service.ledger; /** * Wraps exceptions that are specific to the ledger logic. diff --git a/src/main/java/net/helix/hlx/service/ledger/LedgerService.java b/src/main/java/net/helix/pendulum/service/ledger/LedgerService.java similarity index 95% rename from src/main/java/net/helix/hlx/service/ledger/LedgerService.java rename to src/main/java/net/helix/pendulum/service/ledger/LedgerService.java index faf4792a..622cfdf8 100644 --- a/src/main/java/net/helix/hlx/service/ledger/LedgerService.java +++ b/src/main/java/net/helix/pendulum/service/ledger/LedgerService.java @@ -1,8 +1,8 @@ -package net.helix.hlx.service.ledger; +package net.helix.pendulum.service.ledger; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.Graphstream; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.Graphstream; import java.util.List; import java.util.Map; @@ -37,7 +37,7 @@ public interface LedgerService { * Applies the given milestone to the ledger state.
    *
    * It first marks the transactions that were confirmed by this milestones as confirmed by setting their - * corresponding {@code snapshotIndex} value. Then it generates the {@link net.helix.hlx.model.StateDiff} that + * corresponding {@code snapshotIndex} value. Then it generates the {@link net.helix.pendulum.model.StateDiff} that * reflects the accumulated balance changes of all these transactions and applies it to the latest Snapshot.
    * * @param round the milestone that shall be applied diff --git a/src/main/java/net/helix/hlx/service/ledger/impl/LedgerServiceImpl.java b/src/main/java/net/helix/pendulum/service/ledger/impl/LedgerServiceImpl.java similarity index 91% rename from src/main/java/net/helix/hlx/service/ledger/impl/LedgerServiceImpl.java rename to src/main/java/net/helix/pendulum/service/ledger/impl/LedgerServiceImpl.java index a19db2da..1617a3e4 100644 --- a/src/main/java/net/helix/hlx/service/ledger/impl/LedgerServiceImpl.java +++ b/src/main/java/net/helix/pendulum/service/ledger/impl/LedgerServiceImpl.java @@ -1,21 +1,21 @@ -package net.helix.hlx.service.ledger.impl; - -import net.helix.hlx.BundleValidator; -import net.helix.hlx.controllers.BundleViewModel; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.StateDiffViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.Graphstream; -import net.helix.hlx.service.ledger.LedgerException; -import net.helix.hlx.service.ledger.LedgerService; -import net.helix.hlx.service.milestone.MilestoneService; -import net.helix.hlx.service.snapshot.SnapshotException; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.SnapshotService; -import net.helix.hlx.service.snapshot.impl.SnapshotStateDiffImpl; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.conf.HelixConfig; +package net.helix.pendulum.service.ledger.impl; + +import net.helix.pendulum.BundleValidator; +import net.helix.pendulum.controllers.BundleViewModel; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.StateDiffViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.Graphstream; +import net.helix.pendulum.service.ledger.LedgerException; +import net.helix.pendulum.service.ledger.LedgerService; +import net.helix.pendulum.service.milestone.MilestoneService; +import net.helix.pendulum.service.snapshot.SnapshotException; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.SnapshotService; +import net.helix.pendulum.service.snapshot.impl.SnapshotStateDiffImpl; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.conf.HelixConfig; import java.util.*; @@ -275,21 +275,21 @@ public Map generateBalanceDiff(Set visitedTransactions, Set *
    * It first checks if the {@code snapshotIndex} of the transaction belonging to the milestone was correctly set * already (to determine if this milestone was processed already) and proceeds to generate the {@link - * net.helix.hlx.model.StateDiff} if that is not the case. To do so, it calculates the balance changes, checks if + * net.helix.pendulum.model.StateDiff} if that is not the case. To do so, it calculates the balance changes, checks if * they are consistent and only then writes them to the database.
    *
    * If inconsistencies in the {@code snapshotIndex} are found it issues a reset of the corresponding milestone to * recover from this problem.
    * - * @param round the milestone that shall have its {@link net.helix.hlx.model.StateDiff} generated - * @return {@code true} if the {@link net.helix.hlx.model.StateDiff} could be generated and {@code false} otherwise - * @throws LedgerException if anything unexpected happens while generating the {@link net.helix.hlx.model.StateDiff} + * @param round the milestone that shall have its {@link net.helix.pendulum.model.StateDiff} generated + * @return {@code true} if the {@link net.helix.pendulum.model.StateDiff} could be generated and {@code false} otherwise + * @throws LedgerException if anything unexpected happens while generating the {@link net.helix.pendulum.model.StateDiff} */ private boolean generateStateDiff(RoundViewModel round) throws LedgerException { try { diff --git a/src/main/java/net/helix/hlx/service/milestone/LatestSolidMilestoneTracker.java b/src/main/java/net/helix/pendulum/service/milestone/LatestSolidMilestoneTracker.java similarity index 93% rename from src/main/java/net/helix/hlx/service/milestone/LatestSolidMilestoneTracker.java rename to src/main/java/net/helix/pendulum/service/milestone/LatestSolidMilestoneTracker.java index 061186f5..5ad37b86 100644 --- a/src/main/java/net/helix/hlx/service/milestone/LatestSolidMilestoneTracker.java +++ b/src/main/java/net/helix/pendulum/service/milestone/LatestSolidMilestoneTracker.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.milestone; +package net.helix.pendulum.service.milestone; -import net.helix.hlx.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.SnapshotProvider; /** * This interface defines the contract for the manager that keeps track of the latest solid milestone by incorporating a diff --git a/src/main/java/net/helix/hlx/service/milestone/MilestoneException.java b/src/main/java/net/helix/pendulum/service/milestone/MilestoneException.java similarity index 96% rename from src/main/java/net/helix/hlx/service/milestone/MilestoneException.java rename to src/main/java/net/helix/pendulum/service/milestone/MilestoneException.java index 73115f03..6945b19d 100644 --- a/src/main/java/net/helix/hlx/service/milestone/MilestoneException.java +++ b/src/main/java/net/helix/pendulum/service/milestone/MilestoneException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.milestone; +package net.helix.pendulum.service.milestone; /** * This class is used to wrap exceptions that are specific to the milestone logic. diff --git a/src/main/java/net/helix/hlx/service/milestone/MilestoneService.java b/src/main/java/net/helix/pendulum/service/milestone/MilestoneService.java similarity index 93% rename from src/main/java/net/helix/hlx/service/milestone/MilestoneService.java rename to src/main/java/net/helix/pendulum/service/milestone/MilestoneService.java index 6d11e15e..55ebf849 100644 --- a/src/main/java/net/helix/hlx/service/milestone/MilestoneService.java +++ b/src/main/java/net/helix/pendulum/service/milestone/MilestoneService.java @@ -1,10 +1,10 @@ -package net.helix.hlx.service.milestone; +package net.helix.pendulum.service.milestone; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.Graphstream; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.Graphstream; import java.util.Optional; import java.util.Set; @@ -91,7 +91,7 @@ MilestoneValidity validateMilestone(TransactionViewModel transactionViewModel, i *
    * We determine if the transaction was confirmed by examining its {@code snapshotIndex} value. For this method to * work we require that the previous milestones have been processed already (which is enforced by the {@link - * net.helix.hlx.service.milestone.LatestSolidMilestoneTracker} which applies the milestones in the order that they + * net.helix.pendulum.service.milestone.LatestSolidMilestoneTracker} which applies the milestones in the order that they * are issued by the coordinator).
    * * @param transaction the transaction that shall be examined diff --git a/src/main/java/net/helix/hlx/service/milestone/MilestoneSolidifier.java b/src/main/java/net/helix/pendulum/service/milestone/MilestoneSolidifier.java similarity index 92% rename from src/main/java/net/helix/hlx/service/milestone/MilestoneSolidifier.java rename to src/main/java/net/helix/pendulum/service/milestone/MilestoneSolidifier.java index cb68a1fa..11cb061e 100644 --- a/src/main/java/net/helix/hlx/service/milestone/MilestoneSolidifier.java +++ b/src/main/java/net/helix/pendulum/service/milestone/MilestoneSolidifier.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.milestone; +package net.helix.pendulum.service.milestone; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; /** * This interface defines the contract for a manager that tries to solidify unsolid milestones by incorporating a diff --git a/src/main/java/net/helix/hlx/service/milestone/MilestoneTracker.java b/src/main/java/net/helix/pendulum/service/milestone/MilestoneTracker.java similarity index 95% rename from src/main/java/net/helix/hlx/service/milestone/MilestoneTracker.java rename to src/main/java/net/helix/pendulum/service/milestone/MilestoneTracker.java index 40a5fdbe..026d4178 100644 --- a/src/main/java/net/helix/hlx/service/milestone/MilestoneTracker.java +++ b/src/main/java/net/helix/pendulum/service/milestone/MilestoneTracker.java @@ -1,7 +1,7 @@ -package net.helix.hlx.service.milestone; +package net.helix.pendulum.service.milestone; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; import java.util.Set; diff --git a/src/main/java/net/helix/hlx/service/milestone/MilestoneValidity.java b/src/main/java/net/helix/pendulum/service/milestone/MilestoneValidity.java similarity index 81% rename from src/main/java/net/helix/hlx/service/milestone/MilestoneValidity.java rename to src/main/java/net/helix/pendulum/service/milestone/MilestoneValidity.java index b5e2e0e1..66dc136e 100644 --- a/src/main/java/net/helix/hlx/service/milestone/MilestoneValidity.java +++ b/src/main/java/net/helix/pendulum/service/milestone/MilestoneValidity.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.milestone; +package net.helix.pendulum.service.milestone; /** * Validity states of milestone transactions that are used to express their "relevance" for the ledger state.
    diff --git a/src/main/java/net/helix/hlx/service/milestone/SeenMilestonesRetriever.java b/src/main/java/net/helix/pendulum/service/milestone/SeenMilestonesRetriever.java similarity index 97% rename from src/main/java/net/helix/hlx/service/milestone/SeenMilestonesRetriever.java rename to src/main/java/net/helix/pendulum/service/milestone/SeenMilestonesRetriever.java index 3d6c17ae..fb954560 100644 --- a/src/main/java/net/helix/hlx/service/milestone/SeenMilestonesRetriever.java +++ b/src/main/java/net/helix/pendulum/service/milestone/SeenMilestonesRetriever.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.milestone; +package net.helix.pendulum.service.milestone; /** * Attempts to retrieve the milestones that have been defined in the local snapshots file.
    diff --git a/src/main/java/net/helix/hlx/service/milestone/impl/LatestSolidMilestoneTrackerImpl.java b/src/main/java/net/helix/pendulum/service/milestone/impl/LatestSolidMilestoneTrackerImpl.java similarity index 93% rename from src/main/java/net/helix/hlx/service/milestone/impl/LatestSolidMilestoneTrackerImpl.java rename to src/main/java/net/helix/pendulum/service/milestone/impl/LatestSolidMilestoneTrackerImpl.java index 71f3a9db..0e4f4c1e 100644 --- a/src/main/java/net/helix/hlx/service/milestone/impl/LatestSolidMilestoneTrackerImpl.java +++ b/src/main/java/net/helix/pendulum/service/milestone/impl/LatestSolidMilestoneTrackerImpl.java @@ -1,20 +1,20 @@ -package net.helix.hlx.service.milestone.impl; - -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.ledger.LedgerService; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.milestone.LatestSolidMilestoneTracker; -import net.helix.hlx.service.milestone.MilestoneException; -import net.helix.hlx.service.milestone.MilestoneService; -import net.helix.hlx.service.snapshot.Snapshot; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.utils.RoundIndexUtil; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.log.interval.IntervalLogger; -import net.helix.hlx.utils.thread.DedicatedScheduledExecutorService; -import net.helix.hlx.utils.thread.SilentScheduledExecutorService; +package net.helix.pendulum.service.milestone.impl; + +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.ledger.LedgerService; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.milestone.LatestSolidMilestoneTracker; +import net.helix.pendulum.service.milestone.MilestoneException; +import net.helix.pendulum.service.milestone.MilestoneService; +import net.helix.pendulum.service.snapshot.Snapshot; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.utils.RoundIndexUtil; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.log.interval.IntervalLogger; +import net.helix.pendulum.utils.thread.DedicatedScheduledExecutorService; +import net.helix.pendulum.utils.thread.SilentScheduledExecutorService; import java.util.HashSet; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/net/helix/hlx/service/milestone/impl/MilestonePublisher.java b/src/main/java/net/helix/pendulum/service/milestone/impl/MilestonePublisher.java similarity index 96% rename from src/main/java/net/helix/hlx/service/milestone/impl/MilestonePublisher.java rename to src/main/java/net/helix/pendulum/service/milestone/impl/MilestonePublisher.java index 36bc7a93..f6e060cf 100644 --- a/src/main/java/net/helix/hlx/service/milestone/impl/MilestonePublisher.java +++ b/src/main/java/net/helix/pendulum/service/milestone/impl/MilestonePublisher.java @@ -1,14 +1,13 @@ -package net.helix.hlx.service.milestone.impl; +package net.helix.pendulum.service.milestone.impl; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.crypto.Merkle; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.service.API; -import net.helix.hlx.service.curator.CandidateTracker; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.crypto.Merkle; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.service.API; +import net.helix.pendulum.service.curator.CandidateTracker; -import net.helix.hlx.service.utils.RoundIndexUtil; -import net.helix.hlx.utils.bundle.BundleTypes; +import net.helix.pendulum.service.utils.RoundIndexUtil; import org.apache.commons.lang3.StringUtils; import org.bouncycastle.util.encoders.Hex; import org.slf4j.Logger; diff --git a/src/main/java/net/helix/hlx/service/milestone/impl/MilestoneServiceImpl.java b/src/main/java/net/helix/pendulum/service/milestone/impl/MilestoneServiceImpl.java similarity index 96% rename from src/main/java/net/helix/hlx/service/milestone/impl/MilestoneServiceImpl.java rename to src/main/java/net/helix/pendulum/service/milestone/impl/MilestoneServiceImpl.java index 337dc630..69ed36e9 100644 --- a/src/main/java/net/helix/hlx/service/milestone/impl/MilestoneServiceImpl.java +++ b/src/main/java/net/helix/pendulum/service/milestone/impl/MilestoneServiceImpl.java @@ -1,32 +1,31 @@ -package net.helix.hlx.service.milestone.impl; +package net.helix.pendulum.service.milestone.impl; import com.google.gson.JsonObject; -import net.helix.hlx.BundleValidator; -import net.helix.hlx.conf.ConsensusConfig; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.Merkle; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.IntegerIndex; -import net.helix.hlx.model.StateDiff; -import net.helix.hlx.service.Graphstream; -import net.helix.hlx.service.milestone.MilestoneException; -import net.helix.hlx.service.milestone.MilestoneService; -import net.helix.hlx.service.milestone.MilestoneValidity; -import net.helix.hlx.service.snapshot.Snapshot; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.SnapshotService; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.TransactionValidator; +import net.helix.pendulum.BundleValidator; +import net.helix.pendulum.conf.ConsensusConfig; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.Merkle; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.IntegerIndex; +import net.helix.pendulum.model.StateDiff; +import net.helix.pendulum.service.Graphstream; +import net.helix.pendulum.service.milestone.MilestoneException; +import net.helix.pendulum.service.milestone.MilestoneService; +import net.helix.pendulum.service.milestone.MilestoneValidity; +import net.helix.pendulum.service.snapshot.Snapshot; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.SnapshotService; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.TransactionValidator; import org.bouncycastle.util.encoders.Hex; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.*; -import java.util.stream.Collectors; -import static net.helix.hlx.service.milestone.MilestoneValidity.*; +import static net.helix.pendulum.service.milestone.MilestoneValidity.*; /** * Creates a service instance that allows us to perform milestone specific operations.
    diff --git a/src/main/java/net/helix/hlx/service/milestone/impl/MilestoneSolidifierImpl.java b/src/main/java/net/helix/pendulum/service/milestone/impl/MilestoneSolidifierImpl.java similarity index 96% rename from src/main/java/net/helix/hlx/service/milestone/impl/MilestoneSolidifierImpl.java rename to src/main/java/net/helix/pendulum/service/milestone/impl/MilestoneSolidifierImpl.java index 23eef71a..4e8dd7bc 100644 --- a/src/main/java/net/helix/hlx/service/milestone/impl/MilestoneSolidifierImpl.java +++ b/src/main/java/net/helix/pendulum/service/milestone/impl/MilestoneSolidifierImpl.java @@ -1,12 +1,12 @@ -package net.helix.hlx.service.milestone.impl; - -import net.helix.hlx.TransactionValidator; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.milestone.MilestoneSolidifier; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.utils.log.interval.IntervalLogger; -import net.helix.hlx.utils.thread.DedicatedScheduledExecutorService; -import net.helix.hlx.utils.thread.SilentScheduledExecutorService; +package net.helix.pendulum.service.milestone.impl; + +import net.helix.pendulum.TransactionValidator; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.milestone.MilestoneSolidifier; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.utils.log.interval.IntervalLogger; +import net.helix.pendulum.utils.thread.DedicatedScheduledExecutorService; +import net.helix.pendulum.utils.thread.SilentScheduledExecutorService; import java.util.HashMap; import java.util.Iterator; diff --git a/src/main/java/net/helix/hlx/service/milestone/impl/MilestoneTrackerImpl.java b/src/main/java/net/helix/pendulum/service/milestone/impl/MilestoneTrackerImpl.java similarity index 95% rename from src/main/java/net/helix/hlx/service/milestone/impl/MilestoneTrackerImpl.java rename to src/main/java/net/helix/pendulum/service/milestone/impl/MilestoneTrackerImpl.java index bb1f6f17..17e61750 100644 --- a/src/main/java/net/helix/hlx/service/milestone/impl/MilestoneTrackerImpl.java +++ b/src/main/java/net/helix/pendulum/service/milestone/impl/MilestoneTrackerImpl.java @@ -1,19 +1,19 @@ -package net.helix.hlx.service.milestone.impl; - -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.AddressViewModel; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.milestone.*; -import net.helix.hlx.service.curator.CandidateTracker; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.utils.RoundIndexUtil; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.log.interval.IntervalLogger; -import net.helix.hlx.utils.thread.DedicatedScheduledExecutorService; -import net.helix.hlx.utils.thread.SilentScheduledExecutorService; +package net.helix.pendulum.service.milestone.impl; + +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.AddressViewModel; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.milestone.*; +import net.helix.pendulum.service.curator.CandidateTracker; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.utils.RoundIndexUtil; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.log.interval.IntervalLogger; +import net.helix.pendulum.utils.thread.DedicatedScheduledExecutorService; +import net.helix.pendulum.utils.thread.SilentScheduledExecutorService; import java.util.*; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/net/helix/hlx/service/milestone/impl/SeenMilestonesRetrieverImpl.java b/src/main/java/net/helix/pendulum/service/milestone/impl/SeenMilestonesRetrieverImpl.java similarity index 91% rename from src/main/java/net/helix/hlx/service/milestone/impl/SeenMilestonesRetrieverImpl.java rename to src/main/java/net/helix/pendulum/service/milestone/impl/SeenMilestonesRetrieverImpl.java index 6d670d58..ea7b86dd 100644 --- a/src/main/java/net/helix/hlx/service/milestone/impl/SeenMilestonesRetrieverImpl.java +++ b/src/main/java/net/helix/pendulum/service/milestone/impl/SeenMilestonesRetrieverImpl.java @@ -1,15 +1,15 @@ -package net.helix.hlx.service.milestone.impl; - -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.network.TransactionRequester; -import net.helix.hlx.service.milestone.SeenMilestonesRetriever; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.log.interval.IntervalLogger; -import net.helix.hlx.utils.thread.DedicatedScheduledExecutorService; -import net.helix.hlx.utils.thread.SilentScheduledExecutorService; +package net.helix.pendulum.service.milestone.impl; + +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.network.TransactionRequester; +import net.helix.pendulum.service.milestone.SeenMilestonesRetriever; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.log.interval.IntervalLogger; +import net.helix.pendulum.utils.thread.DedicatedScheduledExecutorService; +import net.helix.pendulum.utils.thread.SilentScheduledExecutorService; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/net/helix/hlx/service/nominee/NomineeException.java b/src/main/java/net/helix/pendulum/service/nominee/NomineeException.java similarity index 96% rename from src/main/java/net/helix/hlx/service/nominee/NomineeException.java rename to src/main/java/net/helix/pendulum/service/nominee/NomineeException.java index 9b2b5b92..d1c1a8cd 100755 --- a/src/main/java/net/helix/hlx/service/nominee/NomineeException.java +++ b/src/main/java/net/helix/pendulum/service/nominee/NomineeException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.nominee; +package net.helix.pendulum.service.nominee; /** * This class is used to wrap exceptions that are specific to the curator logic. diff --git a/src/main/java/net/helix/hlx/service/nominee/NomineeService.java b/src/main/java/net/helix/pendulum/service/nominee/NomineeService.java similarity index 86% rename from src/main/java/net/helix/hlx/service/nominee/NomineeService.java rename to src/main/java/net/helix/pendulum/service/nominee/NomineeService.java index 3a4af141..3d87c310 100755 --- a/src/main/java/net/helix/hlx/service/nominee/NomineeService.java +++ b/src/main/java/net/helix/pendulum/service/nominee/NomineeService.java @@ -1,7 +1,7 @@ -package net.helix.hlx.service.nominee; +package net.helix.pendulum.service.nominee; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.SpongeFactory; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.SpongeFactory; public interface NomineeService { diff --git a/src/main/java/net/helix/hlx/service/nominee/NomineeSolidifier.java b/src/main/java/net/helix/pendulum/service/nominee/NomineeSolidifier.java similarity index 92% rename from src/main/java/net/helix/hlx/service/nominee/NomineeSolidifier.java rename to src/main/java/net/helix/pendulum/service/nominee/NomineeSolidifier.java index 6d065bfa..f2f630c5 100755 --- a/src/main/java/net/helix/hlx/service/nominee/NomineeSolidifier.java +++ b/src/main/java/net/helix/pendulum/service/nominee/NomineeSolidifier.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.nominee; +package net.helix.pendulum.service.nominee; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; /** * This interface defines the contract for a manager that tries to solidify unsolid candidates by incorporating a diff --git a/src/main/java/net/helix/hlx/service/nominee/NomineeTracker.java b/src/main/java/net/helix/pendulum/service/nominee/NomineeTracker.java similarity index 86% rename from src/main/java/net/helix/hlx/service/nominee/NomineeTracker.java rename to src/main/java/net/helix/pendulum/service/nominee/NomineeTracker.java index e4755874..7759d9e0 100755 --- a/src/main/java/net/helix/hlx/service/nominee/NomineeTracker.java +++ b/src/main/java/net/helix/pendulum/service/nominee/NomineeTracker.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.nominee; +package net.helix.pendulum.service.nominee; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; import java.util.Set; diff --git a/src/main/java/net/helix/hlx/service/nominee/NomineeValidity.java b/src/main/java/net/helix/pendulum/service/nominee/NomineeValidity.java similarity index 80% rename from src/main/java/net/helix/hlx/service/nominee/NomineeValidity.java rename to src/main/java/net/helix/pendulum/service/nominee/NomineeValidity.java index e024dafe..9f02644b 100755 --- a/src/main/java/net/helix/hlx/service/nominee/NomineeValidity.java +++ b/src/main/java/net/helix/pendulum/service/nominee/NomineeValidity.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.nominee; +package net.helix.pendulum.service.nominee; /** * Validity states of candidate transactions that are used to express their "relevance" for the curator. diff --git a/src/main/java/net/helix/hlx/service/nominee/impl/NomineeServiceImpl.java b/src/main/java/net/helix/pendulum/service/nominee/impl/NomineeServiceImpl.java similarity index 82% rename from src/main/java/net/helix/hlx/service/nominee/impl/NomineeServiceImpl.java rename to src/main/java/net/helix/pendulum/service/nominee/impl/NomineeServiceImpl.java index 4f814d34..9d26d556 100755 --- a/src/main/java/net/helix/hlx/service/nominee/impl/NomineeServiceImpl.java +++ b/src/main/java/net/helix/pendulum/service/nominee/impl/NomineeServiceImpl.java @@ -1,26 +1,25 @@ -package net.helix.hlx.service.nominee.impl; - -import net.helix.hlx.BundleValidator; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.Merkle; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.nominee.NomineeValidity; -import net.helix.hlx.service.nominee.NomineeException; -import net.helix.hlx.service.nominee.NomineeService; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.SnapshotService; -import net.helix.hlx.storage.Tangle; +package net.helix.pendulum.service.nominee.impl; + +import net.helix.pendulum.BundleValidator; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.Merkle; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.nominee.NomineeValidity; +import net.helix.pendulum.service.nominee.NomineeException; +import net.helix.pendulum.service.nominee.NomineeService; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.SnapshotService; +import net.helix.pendulum.storage.Tangle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.*; -import java.util.stream.Collectors; -import static net.helix.hlx.service.nominee.NomineeValidity.*; +import static net.helix.pendulum.service.nominee.NomineeValidity.*; public class NomineeServiceImpl implements NomineeService { diff --git a/src/main/java/net/helix/hlx/service/nominee/impl/NomineeSolidifierImpl.java b/src/main/java/net/helix/pendulum/service/nominee/impl/NomineeSolidifierImpl.java similarity index 93% rename from src/main/java/net/helix/hlx/service/nominee/impl/NomineeSolidifierImpl.java rename to src/main/java/net/helix/pendulum/service/nominee/impl/NomineeSolidifierImpl.java index 7c3ba93b..5bbc6f9b 100755 --- a/src/main/java/net/helix/hlx/service/nominee/impl/NomineeSolidifierImpl.java +++ b/src/main/java/net/helix/pendulum/service/nominee/impl/NomineeSolidifierImpl.java @@ -1,12 +1,12 @@ -package net.helix.hlx.service.nominee.impl; - -import net.helix.hlx.TransactionValidator; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.nominee.NomineeSolidifier; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.utils.log.interval.IntervalLogger; -import net.helix.hlx.utils.thread.DedicatedScheduledExecutorService; -import net.helix.hlx.utils.thread.SilentScheduledExecutorService; +package net.helix.pendulum.service.nominee.impl; + +import net.helix.pendulum.TransactionValidator; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.nominee.NomineeSolidifier; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.utils.log.interval.IntervalLogger; +import net.helix.pendulum.utils.thread.DedicatedScheduledExecutorService; +import net.helix.pendulum.utils.thread.SilentScheduledExecutorService; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/net/helix/hlx/service/nominee/impl/NomineeTrackerImpl.java b/src/main/java/net/helix/pendulum/service/nominee/impl/NomineeTrackerImpl.java similarity index 89% rename from src/main/java/net/helix/hlx/service/nominee/impl/NomineeTrackerImpl.java rename to src/main/java/net/helix/pendulum/service/nominee/impl/NomineeTrackerImpl.java index 82be8187..83f83b57 100755 --- a/src/main/java/net/helix/hlx/service/nominee/impl/NomineeTrackerImpl.java +++ b/src/main/java/net/helix/pendulum/service/nominee/impl/NomineeTrackerImpl.java @@ -1,22 +1,22 @@ -package net.helix.hlx.service.nominee.impl; - -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.AddressViewModel; -import net.helix.hlx.controllers.BundleViewModel; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.service.nominee.NomineeService; -import net.helix.hlx.service.nominee.NomineeSolidifier; -import net.helix.hlx.service.nominee.NomineeTracker; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.utils.RoundIndexUtil; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.log.interval.IntervalLogger; -import net.helix.hlx.utils.thread.DedicatedScheduledExecutorService; -import net.helix.hlx.utils.thread.SilentScheduledExecutorService; +package net.helix.pendulum.service.nominee.impl; + +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.AddressViewModel; +import net.helix.pendulum.controllers.BundleViewModel; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.service.nominee.NomineeService; +import net.helix.pendulum.service.nominee.NomineeSolidifier; +import net.helix.pendulum.service.nominee.NomineeTracker; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.utils.RoundIndexUtil; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.log.interval.IntervalLogger; +import net.helix.pendulum.utils.thread.DedicatedScheduledExecutorService; +import net.helix.pendulum.utils.thread.SilentScheduledExecutorService; import java.util.ArrayDeque; import java.util.Deque; diff --git a/src/main/java/net/helix/hlx/service/restserver/ApiProcessor.java b/src/main/java/net/helix/pendulum/service/restserver/ApiProcessor.java similarity index 81% rename from src/main/java/net/helix/hlx/service/restserver/ApiProcessor.java rename to src/main/java/net/helix/pendulum/service/restserver/ApiProcessor.java index 631cdaca..c84f585d 100644 --- a/src/main/java/net/helix/hlx/service/restserver/ApiProcessor.java +++ b/src/main/java/net/helix/pendulum/service/restserver/ApiProcessor.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.restserver; +package net.helix.pendulum.service.restserver; -import net.helix.hlx.service.dto.AbstractResponse; +import net.helix.pendulum.service.dto.AbstractResponse; import java.net.InetAddress; diff --git a/src/main/java/net/helix/hlx/service/restserver/RestConnector.java b/src/main/java/net/helix/pendulum/service/restserver/RestConnector.java similarity index 92% rename from src/main/java/net/helix/hlx/service/restserver/RestConnector.java rename to src/main/java/net/helix/pendulum/service/restserver/RestConnector.java index 2cf9e967..5e8bc644 100644 --- a/src/main/java/net/helix/hlx/service/restserver/RestConnector.java +++ b/src/main/java/net/helix/pendulum/service/restserver/RestConnector.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.restserver; +package net.helix.pendulum.service.restserver; /** * diff --git a/src/main/java/net/helix/hlx/service/restserver/resteasy/RestEasy.java b/src/main/java/net/helix/pendulum/service/restserver/resteasy/RestEasy.java similarity index 94% rename from src/main/java/net/helix/hlx/service/restserver/resteasy/RestEasy.java rename to src/main/java/net/helix/pendulum/service/restserver/resteasy/RestEasy.java index 9a43e88d..14ca13b0 100644 --- a/src/main/java/net/helix/hlx/service/restserver/resteasy/RestEasy.java +++ b/src/main/java/net/helix/pendulum/service/restserver/resteasy/RestEasy.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.restserver.resteasy; +package net.helix.pendulum.service.restserver.resteasy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -10,16 +10,16 @@ import io.undertow.server.HttpServerExchange; import io.undertow.servlet.api.DeploymentInfo; import io.undertow.util.*; -import net.helix.hlx.Helix; -import net.helix.hlx.conf.APIConfig; -import net.helix.hlx.service.RemoteAuth; -import net.helix.hlx.service.dto.AbstractResponse; -import net.helix.hlx.service.dto.AccessLimitedResponse; -import net.helix.hlx.service.dto.ErrorResponse; -import net.helix.hlx.service.dto.ExceptionResponse; -import net.helix.hlx.service.restserver.ApiProcessor; -import net.helix.hlx.service.restserver.RestConnector; -import net.helix.hlx.utils.HelixIOUtils; +import net.helix.pendulum.Pendulum; +import net.helix.pendulum.conf.APIConfig; +import net.helix.pendulum.service.RemoteAuth; +import net.helix.pendulum.service.dto.AbstractResponse; +import net.helix.pendulum.service.dto.AccessLimitedResponse; +import net.helix.pendulum.service.dto.ErrorResponse; +import net.helix.pendulum.service.dto.ExceptionResponse; +import net.helix.pendulum.service.restserver.ApiProcessor; +import net.helix.pendulum.service.restserver.RestConnector; +import net.helix.pendulum.utils.HelixIOUtils; import org.jboss.resteasy.plugins.server.undertow.UndertowJaxrsServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -93,7 +93,7 @@ public RestEasy(APIConfig configuration) { * If reading from the previous epoch fails, a log is printed. The API will continue to initialize. * *

  • - * Get the {@link APIConfig} from the {@link Helix} instance, + * Get the {@link APIConfig} from the {@link Pendulum} instance, * and read {@link APIConfig#getPort()} and {@link APIConfig#getApiHost()} *
    • *
  • diff --git a/src/main/java/net/helix/hlx/service/snapshot/LocalSnapshotManager.java b/src/main/java/net/helix/pendulum/service/snapshot/LocalSnapshotManager.java similarity index 75% rename from src/main/java/net/helix/hlx/service/snapshot/LocalSnapshotManager.java rename to src/main/java/net/helix/pendulum/service/snapshot/LocalSnapshotManager.java index f588e418..e79e036f 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/LocalSnapshotManager.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/LocalSnapshotManager.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.snapshot; +package net.helix.pendulum.service.snapshot; -import net.helix.hlx.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.milestone.MilestoneTracker; /** * Represents the manager for local {@link Snapshot}s that takes care of periodically creating a new {@link Snapshot} @@ -10,12 +10,12 @@ public interface LocalSnapshotManager { /** * Starts the automatic creation of local {@link Snapshot}s by spawning a background {@link Thread}, that * periodically checks if the last snapshot is older than - * {@link net.helix.hlx.conf.SnapshotConfig#getLocalSnapshotsIntervalSynced()}. + * {@link net.helix.pendulum.conf.SnapshotConfig#getLocalSnapshotsIntervalSynced()}. * * When we detect that it is time for a local snapshot we internally trigger its creation. * * Note: If the node is not fully synced we use - * {@link net.helix.hlx.conf.SnapshotConfig#getLocalSnapshotsIntervalUnsynced()} instead. + * {@link net.helix.pendulum.conf.SnapshotConfig#getLocalSnapshotsIntervalUnsynced()} instead. * * @param milestoneTracker tracker for the milestones to determine when a new local snapshot is due */ diff --git a/src/main/java/net/helix/hlx/service/snapshot/Snapshot.java b/src/main/java/net/helix/pendulum/service/snapshot/Snapshot.java similarity index 98% rename from src/main/java/net/helix/hlx/service/snapshot/Snapshot.java rename to src/main/java/net/helix/pendulum/service/snapshot/Snapshot.java index e3faf014..7d9a9c84 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/Snapshot.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/Snapshot.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.snapshot; +package net.helix.pendulum.service.snapshot; /** * Represents a complete Snapshot of the ledger state. diff --git a/src/main/java/net/helix/hlx/service/snapshot/SnapshotException.java b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotException.java similarity index 96% rename from src/main/java/net/helix/hlx/service/snapshot/SnapshotException.java rename to src/main/java/net/helix/pendulum/service/snapshot/SnapshotException.java index 62b1b761..5165246f 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/SnapshotException.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.snapshot; +package net.helix.pendulum.service.snapshot; /** * This class is used to wrap exceptions that are specific to the snapshot logic. diff --git a/src/main/java/net/helix/hlx/service/snapshot/SnapshotMetaData.java b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotMetaData.java similarity index 98% rename from src/main/java/net/helix/hlx/service/snapshot/SnapshotMetaData.java rename to src/main/java/net/helix/pendulum/service/snapshot/SnapshotMetaData.java index 519fd467..741e9fbf 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/SnapshotMetaData.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotMetaData.java @@ -1,9 +1,8 @@ -package net.helix.hlx.service.snapshot; +package net.helix.pendulum.service.snapshot; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; import java.util.Map; -import java.util.List; /** * Represents the meta data of a snapshot. diff --git a/src/main/java/net/helix/hlx/service/snapshot/SnapshotProvider.java b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotProvider.java similarity index 97% rename from src/main/java/net/helix/hlx/service/snapshot/SnapshotProvider.java rename to src/main/java/net/helix/pendulum/service/snapshot/SnapshotProvider.java index 456a918f..8e89f6fe 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/SnapshotProvider.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotProvider.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.snapshot; +package net.helix.pendulum.service.snapshot; /** * The data provider that allows to retrieve the {@link Snapshot} instances that are relevant for the node. diff --git a/src/main/java/net/helix/hlx/service/snapshot/SnapshotService.java b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotService.java similarity index 95% rename from src/main/java/net/helix/hlx/service/snapshot/SnapshotService.java rename to src/main/java/net/helix/pendulum/service/snapshot/SnapshotService.java index bc0254da..c1b58aac 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/SnapshotService.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotService.java @@ -1,12 +1,11 @@ -package net.helix.hlx.service.snapshot; +package net.helix.pendulum.service.snapshot; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.transactionpruning.TransactionPruner; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.transactionpruning.TransactionPruner; import java.util.Map; -import java.util.List; /** * Represents the service for snapshots that contains the relevant business logic for modifying {@link Snapshot}s and diff --git a/src/main/java/net/helix/hlx/service/snapshot/SnapshotState.java b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotState.java similarity index 97% rename from src/main/java/net/helix/hlx/service/snapshot/SnapshotState.java rename to src/main/java/net/helix/pendulum/service/snapshot/SnapshotState.java index f21c5681..12fc0f95 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/SnapshotState.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotState.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.snapshot; +package net.helix.pendulum.service.snapshot; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; import java.util.Map; diff --git a/src/main/java/net/helix/hlx/service/snapshot/SnapshotStateDiff.java b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotStateDiff.java similarity index 88% rename from src/main/java/net/helix/hlx/service/snapshot/SnapshotStateDiff.java rename to src/main/java/net/helix/pendulum/service/snapshot/SnapshotStateDiff.java index c3d7eb0d..b19265fd 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/SnapshotStateDiff.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/SnapshotStateDiff.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.snapshot; +package net.helix.pendulum.service.snapshot; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; import java.util.Map; diff --git a/src/main/java/net/helix/hlx/service/snapshot/impl/LocalSnapshotManagerImpl.java b/src/main/java/net/helix/pendulum/service/snapshot/impl/LocalSnapshotManagerImpl.java similarity index 87% rename from src/main/java/net/helix/hlx/service/snapshot/impl/LocalSnapshotManagerImpl.java rename to src/main/java/net/helix/pendulum/service/snapshot/impl/LocalSnapshotManagerImpl.java index c93794ec..deff84e4 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/impl/LocalSnapshotManagerImpl.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/impl/LocalSnapshotManagerImpl.java @@ -1,14 +1,14 @@ -package net.helix.hlx.service.snapshot.impl; - -import net.helix.hlx.conf.SnapshotConfig; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.snapshot.LocalSnapshotManager; -import net.helix.hlx.service.snapshot.SnapshotException; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.SnapshotService; -import net.helix.hlx.service.transactionpruning.TransactionPruner; -import net.helix.hlx.utils.thread.ThreadIdentifier; -import net.helix.hlx.utils.thread.ThreadUtils; +package net.helix.pendulum.service.snapshot.impl; + +import net.helix.pendulum.conf.SnapshotConfig; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.snapshot.LocalSnapshotManager; +import net.helix.pendulum.service.snapshot.SnapshotException; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.SnapshotService; +import net.helix.pendulum.service.transactionpruning.TransactionPruner; +import net.helix.pendulum.utils.thread.ThreadIdentifier; +import net.helix.pendulum.utils.thread.ThreadUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,7 +21,7 @@ */ public class LocalSnapshotManagerImpl implements LocalSnapshotManager { /** - * The interval (in milliseconds) in which we check if a new local {@link net.helix.hlx.service.snapshot.Snapshot} is + * The interval (in milliseconds) in which we check if a new local {@link net.helix.pendulum.service.snapshot.Snapshot} is * due. */ private static final int LOCAL_SNAPSHOT_RESCAN_INTERVAL = 10000; @@ -39,12 +39,12 @@ public class LocalSnapshotManagerImpl implements LocalSnapshotManager { private static final Logger log = LoggerFactory.getLogger(LocalSnapshotManagerImpl.class); /** - * Data provider for the relevant {@link net.helix.hlx.service.snapshot.Snapshot} instances. + * Data provider for the relevant {@link net.helix.pendulum.service.snapshot.Snapshot} instances. */ private SnapshotProvider snapshotProvider; /** - * Service that contains the logic for generating local {@link net.helix.hlx.service.snapshot.Snapshot}s. + * Service that contains the logic for generating local {@link net.helix.pendulum.service.snapshot.Snapshot}s. */ private SnapshotService snapshotService; @@ -121,9 +121,9 @@ public void shutdown() { /** * This method contains the logic for the monitoring Thread. * - * It periodically checks if a new {@link net.helix.hlx.service.snapshot.Snapshot} has to be taken until the - * {@link Thread} is terminated. If it detects that a {@link net.helix.hlx.service.snapshot.Snapshot} is due it - * triggers the creation of the {@link net.helix.hlx.service.snapshot.Snapshot} by calling + * It periodically checks if a new {@link net.helix.pendulum.service.snapshot.Snapshot} has to be taken until the + * {@link Thread} is terminated. If it detects that a {@link net.helix.pendulum.service.snapshot.Snapshot} is due it + * triggers the creation of the {@link net.helix.pendulum.service.snapshot.Snapshot} by calling * {@link SnapshotService#takeLocalSnapshot(MilestoneTracker, TransactionPruner)}. * * @param milestoneTracker tracker for the milestones to determine when a new local snapshot is due diff --git a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotImpl.java b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotImpl.java similarity index 98% rename from src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotImpl.java rename to src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotImpl.java index b22333fd..016467e3 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotImpl.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotImpl.java @@ -1,7 +1,7 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.*; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.*; import java.util.HashSet; import java.util.Map; @@ -9,7 +9,6 @@ import java.util.Set; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import java.util.List; /** * Implements the basic contract of the {@link Snapshot} interface. diff --git a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotMetaDataImpl.java b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotMetaDataImpl.java similarity index 97% rename from src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotMetaDataImpl.java rename to src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotMetaDataImpl.java index 7f0bde1d..1a338748 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotMetaDataImpl.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotMetaDataImpl.java @@ -1,13 +1,11 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.SnapshotMetaData; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.SnapshotMetaData; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import java.util.LinkedList; -import java.util.List; /** * Implements the basic contract of the {@link SnapshotMetaData} interface. diff --git a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotProviderImpl.java b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotProviderImpl.java similarity index 98% rename from src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotProviderImpl.java rename to src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotProviderImpl.java index 716aab65..2e9aa473 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotProviderImpl.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotProviderImpl.java @@ -1,12 +1,12 @@ -package net.helix.hlx.service.snapshot.impl; - -import net.helix.hlx.SignedFiles; -import net.helix.hlx.conf.SnapshotConfig; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.service.snapshot.*; -import net.helix.hlx.service.spentaddresses.SpentAddressesException; -import net.helix.hlx.service.spentaddresses.SpentAddressesProvider; +package net.helix.pendulum.service.snapshot.impl; + +import net.helix.pendulum.SignedFiles; +import net.helix.pendulum.conf.SnapshotConfig; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.service.snapshot.*; +import net.helix.pendulum.service.spentaddresses.SpentAddressesException; +import net.helix.pendulum.service.spentaddresses.SpentAddressesProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,8 +16,6 @@ import java.nio.file.StandardCopyOption; import java.util.HashMap; import java.util.Map; -import java.util.List; -import java.util.LinkedList; import java.util.stream.Stream; /** diff --git a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotServiceImpl.java b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotServiceImpl.java similarity index 95% rename from src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotServiceImpl.java rename to src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotServiceImpl.java index bef55c6c..5d012df5 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotServiceImpl.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotServiceImpl.java @@ -1,24 +1,24 @@ -package net.helix.hlx.service.snapshot.impl; - -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.ApproveeViewModel; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.StateDiffViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.snapshot.*; -import net.helix.hlx.service.spentaddresses.SpentAddressesProvider; -import net.helix.hlx.service.spentaddresses.SpentAddressesService; -import net.helix.hlx.service.transactionpruning.TransactionPruner; -import net.helix.hlx.service.transactionpruning.TransactionPruningException; -import net.helix.hlx.service.transactionpruning.jobs.MilestonePrunerJob; -import net.helix.hlx.service.transactionpruning.jobs.UnconfirmedSubtanglePrunerJob; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.dag.DAGHelper; -import net.helix.hlx.utils.dag.TraversalException; -import net.helix.hlx.utils.log.ProgressLogger; -import net.helix.hlx.utils.log.interval.IntervalProgressLogger; +package net.helix.pendulum.service.snapshot.impl; + +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.ApproveeViewModel; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.StateDiffViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.snapshot.*; +import net.helix.pendulum.service.spentaddresses.SpentAddressesProvider; +import net.helix.pendulum.service.spentaddresses.SpentAddressesService; +import net.helix.pendulum.service.transactionpruning.TransactionPruner; +import net.helix.pendulum.service.transactionpruning.TransactionPruningException; +import net.helix.pendulum.service.transactionpruning.jobs.MilestonePrunerJob; +import net.helix.pendulum.service.transactionpruning.jobs.UnconfirmedSubtanglePrunerJob; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.dag.DAGHelper; +import net.helix.pendulum.utils.dag.TraversalException; +import net.helix.pendulum.utils.log.ProgressLogger; +import net.helix.pendulum.utils.log.interval.IntervalProgressLogger; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -420,7 +420,7 @@ private RoundViewModel determineMilestoneForLocalSnapshot(Tangle tangle, Snapsho } /** - * This method creates {@link net.helix.hlx.service.transactionpruning.TransactionPrunerJob}s for the expired solid + * This method creates {@link net.helix.pendulum.service.transactionpruning.TransactionPrunerJob}s for the expired solid * entry points, which removes the unconfirmed subtangles branching off of these transactions. * * We only clean up these subtangles if the transaction that they are branching off has been cleaned up already by a @@ -455,7 +455,7 @@ private void cleanupExpiredSolidEntryPoints(Tangle tangle, Map ol } /** - * This method creates the {@link net.helix.hlx.service.transactionpruning.TransactionPrunerJob}s that are + * This method creates the {@link net.helix.pendulum.service.transactionpruning.TransactionPrunerJob}s that are * responsible for removing the old data. * * It first calculates the range of milestones that shall be deleted and then issues a {@link MilestonePrunerJob} diff --git a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotStateDiffImpl.java b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateDiffImpl.java similarity index 87% rename from src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotStateDiffImpl.java rename to src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateDiffImpl.java index 1bb7e2df..b39f309d 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotStateDiffImpl.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateDiffImpl.java @@ -1,8 +1,8 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.SnapshotState; -import net.helix.hlx.service.snapshot.SnapshotStateDiff; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.SnapshotState; +import net.helix.pendulum.service.snapshot.SnapshotStateDiff; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotStateImpl.java b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateImpl.java similarity index 93% rename from src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotStateImpl.java rename to src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateImpl.java index 5b65566e..c182672a 100644 --- a/src/main/java/net/helix/hlx/service/snapshot/impl/SnapshotStateImpl.java +++ b/src/main/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateImpl.java @@ -1,10 +1,10 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.SnapshotException; -import net.helix.hlx.service.snapshot.SnapshotState; -import net.helix.hlx.service.snapshot.SnapshotStateDiff; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.SnapshotException; +import net.helix.pendulum.service.snapshot.SnapshotState; +import net.helix.pendulum.service.snapshot.SnapshotStateDiff; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/service/spentaddresses/SpentAddressesException.java b/src/main/java/net/helix/pendulum/service/spentaddresses/SpentAddressesException.java similarity index 96% rename from src/main/java/net/helix/hlx/service/spentaddresses/SpentAddressesException.java rename to src/main/java/net/helix/pendulum/service/spentaddresses/SpentAddressesException.java index b8cd65de..cece522d 100644 --- a/src/main/java/net/helix/hlx/service/spentaddresses/SpentAddressesException.java +++ b/src/main/java/net/helix/pendulum/service/spentaddresses/SpentAddressesException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.spentaddresses; +package net.helix.pendulum.service.spentaddresses; /** * This class is used to wrap exceptions that are specific to the spent addresses logic. diff --git a/src/main/java/net/helix/hlx/service/spentaddresses/SpentAddressesProvider.java b/src/main/java/net/helix/pendulum/service/spentaddresses/SpentAddressesProvider.java similarity index 93% rename from src/main/java/net/helix/hlx/service/spentaddresses/SpentAddressesProvider.java rename to src/main/java/net/helix/pendulum/service/spentaddresses/SpentAddressesProvider.java index 0d951dd9..d7c9f572 100644 --- a/src/main/java/net/helix/hlx/service/spentaddresses/SpentAddressesProvider.java +++ b/src/main/java/net/helix/pendulum/service/spentaddresses/SpentAddressesProvider.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.spentaddresses; +package net.helix.pendulum.service.spentaddresses; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; import java.util.Collection; diff --git a/src/main/java/net/helix/hlx/service/spentaddresses/SpentAddressesService.java b/src/main/java/net/helix/pendulum/service/spentaddresses/SpentAddressesService.java similarity index 88% rename from src/main/java/net/helix/hlx/service/spentaddresses/SpentAddressesService.java rename to src/main/java/net/helix/pendulum/service/spentaddresses/SpentAddressesService.java index 76e20091..cfce39c1 100644 --- a/src/main/java/net/helix/hlx/service/spentaddresses/SpentAddressesService.java +++ b/src/main/java/net/helix/pendulum/service/spentaddresses/SpentAddressesService.java @@ -1,7 +1,7 @@ -package net.helix.hlx.service.spentaddresses; +package net.helix.pendulum.service.spentaddresses; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; import java.util.Collection; diff --git a/src/main/java/net/helix/hlx/service/spentaddresses/impl/SpentAddressesProviderImpl.java b/src/main/java/net/helix/pendulum/service/spentaddresses/impl/SpentAddressesProviderImpl.java similarity index 85% rename from src/main/java/net/helix/hlx/service/spentaddresses/impl/SpentAddressesProviderImpl.java rename to src/main/java/net/helix/pendulum/service/spentaddresses/impl/SpentAddressesProviderImpl.java index e6f500c3..c4e90036 100644 --- a/src/main/java/net/helix/hlx/service/spentaddresses/impl/SpentAddressesProviderImpl.java +++ b/src/main/java/net/helix/pendulum/service/spentaddresses/impl/SpentAddressesProviderImpl.java @@ -1,19 +1,17 @@ -package net.helix.hlx.service.spentaddresses.impl; +package net.helix.pendulum.service.spentaddresses.impl; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.conf.SnapshotConfig; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.model.persistables.SpentAddress; -import net.helix.hlx.service.spentaddresses.SpentAddressesException; -import net.helix.hlx.service.spentaddresses.SpentAddressesProvider; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; -import net.helix.hlx.utils.Pair; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.conf.SnapshotConfig; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.model.persistables.SpentAddress; +import net.helix.pendulum.service.spentaddresses.SpentAddressesException; +import net.helix.pendulum.service.spentaddresses.SpentAddressesProvider; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; +import net.helix.pendulum.utils.Pair; import java.io.BufferedReader; import java.io.InputStream; diff --git a/src/main/java/net/helix/hlx/service/spentaddresses/impl/SpentAddressesServiceImpl.java b/src/main/java/net/helix/pendulum/service/spentaddresses/impl/SpentAddressesServiceImpl.java similarity index 86% rename from src/main/java/net/helix/hlx/service/spentaddresses/impl/SpentAddressesServiceImpl.java rename to src/main/java/net/helix/pendulum/service/spentaddresses/impl/SpentAddressesServiceImpl.java index 74431106..8030ab18 100644 --- a/src/main/java/net/helix/hlx/service/spentaddresses/impl/SpentAddressesServiceImpl.java +++ b/src/main/java/net/helix/pendulum/service/spentaddresses/impl/SpentAddressesServiceImpl.java @@ -1,18 +1,18 @@ -package net.helix.hlx.service.spentaddresses.impl; - -import net.helix.hlx.BundleValidator; -import net.helix.hlx.controllers.AddressViewModel; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.spentaddresses.SpentAddressesException; -import net.helix.hlx.service.spentaddresses.SpentAddressesProvider; -import net.helix.hlx.service.spentaddresses.SpentAddressesService; -import net.helix.hlx.service.tipselection.TailFinder; -import net.helix.hlx.service.tipselection.impl.TailFinderImpl; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.dag.DAGHelper; +package net.helix.pendulum.service.spentaddresses.impl; + +import net.helix.pendulum.BundleValidator; +import net.helix.pendulum.controllers.AddressViewModel; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.spentaddresses.SpentAddressesException; +import net.helix.pendulum.service.spentaddresses.SpentAddressesProvider; +import net.helix.pendulum.service.spentaddresses.SpentAddressesService; +import net.helix.pendulum.service.tipselection.TailFinder; +import net.helix.pendulum.service.tipselection.impl.TailFinderImpl; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.dag.DAGHelper; import org.apache.commons.collections4.CollectionUtils; import pl.touk.throwing.ThrowingPredicate; diff --git a/src/main/java/net/helix/hlx/service/stats/TimeWindowedApproveeCounter.java b/src/main/java/net/helix/pendulum/service/stats/TimeWindowedApproveeCounter.java similarity index 93% rename from src/main/java/net/helix/hlx/service/stats/TimeWindowedApproveeCounter.java rename to src/main/java/net/helix/pendulum/service/stats/TimeWindowedApproveeCounter.java index ebc25d96..f8e767e9 100644 --- a/src/main/java/net/helix/hlx/service/stats/TimeWindowedApproveeCounter.java +++ b/src/main/java/net/helix/pendulum/service/stats/TimeWindowedApproveeCounter.java @@ -1,10 +1,10 @@ -package net.helix.hlx.service.stats; +package net.helix.pendulum.service.stats; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.dag.DAGHelper; -import net.helix.hlx.utils.dag.TraversalException; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.dag.DAGHelper; +import net.helix.pendulum.utils.dag.TraversalException; import java.time.Duration; import java.time.Instant; diff --git a/src/main/java/net/helix/hlx/service/stats/TransactionStatsPublisher.java b/src/main/java/net/helix/pendulum/service/stats/TransactionStatsPublisher.java similarity index 94% rename from src/main/java/net/helix/hlx/service/stats/TransactionStatsPublisher.java rename to src/main/java/net/helix/pendulum/service/stats/TransactionStatsPublisher.java index 103fbeab..a3180d15 100644 --- a/src/main/java/net/helix/hlx/service/stats/TransactionStatsPublisher.java +++ b/src/main/java/net/helix/pendulum/service/stats/TransactionStatsPublisher.java @@ -1,10 +1,10 @@ -package net.helix.hlx.service.stats; +package net.helix.pendulum.service.stats; -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.tipselection.TipSelector; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.tipselection.TipSelector; +import net.helix.pendulum.storage.Tangle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/service/tipselection/EntryPointSelector.java b/src/main/java/net/helix/pendulum/service/tipselection/EntryPointSelector.java similarity index 79% rename from src/main/java/net/helix/hlx/service/tipselection/EntryPointSelector.java rename to src/main/java/net/helix/pendulum/service/tipselection/EntryPointSelector.java index 91d6ddb5..c29c3b3c 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/EntryPointSelector.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/EntryPointSelector.java @@ -1,7 +1,7 @@ -package net.helix.hlx.service.tipselection; +package net.helix.pendulum.service.tipselection; -import net.helix.hlx.model.Hash; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; /** * Selects an {@code entryPoint} for tip selection. diff --git a/src/main/java/net/helix/hlx/service/tipselection/RatingCalculator.java b/src/main/java/net/helix/pendulum/service/tipselection/RatingCalculator.java similarity index 74% rename from src/main/java/net/helix/hlx/service/tipselection/RatingCalculator.java rename to src/main/java/net/helix/pendulum/service/tipselection/RatingCalculator.java index d70414bb..8f8aac9d 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/RatingCalculator.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/RatingCalculator.java @@ -1,8 +1,8 @@ -package net.helix.hlx.service.tipselection; +package net.helix.pendulum.service.tipselection; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashId; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashId; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; /** * Calculates the rating for a sub graph diff --git a/src/main/java/net/helix/hlx/service/tipselection/TailFinder.java b/src/main/java/net/helix/pendulum/service/tipselection/TailFinder.java similarity index 86% rename from src/main/java/net/helix/hlx/service/tipselection/TailFinder.java rename to src/main/java/net/helix/pendulum/service/tipselection/TailFinder.java index fdda8339..982961a6 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/TailFinder.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/TailFinder.java @@ -1,7 +1,7 @@ -package net.helix.hlx.service.tipselection; +package net.helix.pendulum.service.tipselection; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; import java.util.Optional; diff --git a/src/main/java/net/helix/hlx/service/tipselection/TipSelector.java b/src/main/java/net/helix/pendulum/service/tipselection/TipSelector.java similarity index 89% rename from src/main/java/net/helix/hlx/service/tipselection/TipSelector.java rename to src/main/java/net/helix/pendulum/service/tipselection/TipSelector.java index f1d169c9..586a3b61 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/TipSelector.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/TipSelector.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.tipselection; +package net.helix.pendulum.service.tipselection; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; import java.util.List; import java.util.Optional; diff --git a/src/main/java/net/helix/hlx/service/tipselection/WalkValidator.java b/src/main/java/net/helix/pendulum/service/tipselection/WalkValidator.java similarity index 84% rename from src/main/java/net/helix/hlx/service/tipselection/WalkValidator.java rename to src/main/java/net/helix/pendulum/service/tipselection/WalkValidator.java index 711ccc40..b4226fb3 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/WalkValidator.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/WalkValidator.java @@ -1,6 +1,6 @@ -package net.helix.hlx.service.tipselection; +package net.helix.pendulum.service.tipselection; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; /** * Validates consistency of tails. diff --git a/src/main/java/net/helix/hlx/service/tipselection/Walker.java b/src/main/java/net/helix/pendulum/service/tipselection/Walker.java similarity index 79% rename from src/main/java/net/helix/hlx/service/tipselection/Walker.java rename to src/main/java/net/helix/pendulum/service/tipselection/Walker.java index 16a95edd..763f9a50 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/Walker.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/Walker.java @@ -1,8 +1,8 @@ -package net.helix.hlx.service.tipselection; +package net.helix.pendulum.service.tipselection; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashId; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashId; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; /** * Walks the tangle from an entry point towards tips diff --git a/src/main/java/net/helix/hlx/service/tipselection/impl/CumulativeWeightCalculator.java b/src/main/java/net/helix/pendulum/service/tipselection/impl/CumulativeWeightCalculator.java similarity index 90% rename from src/main/java/net/helix/hlx/service/tipselection/impl/CumulativeWeightCalculator.java rename to src/main/java/net/helix/pendulum/service/tipselection/impl/CumulativeWeightCalculator.java index 106bf949..cbccc84f 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/impl/CumulativeWeightCalculator.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/impl/CumulativeWeightCalculator.java @@ -1,17 +1,17 @@ -package net.helix.hlx.service.tipselection.impl; - -import net.helix.hlx.controllers.ApproveeViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashId; -import net.helix.hlx.model.HashPrefix; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.tipselection.RatingCalculator; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.collections.impl.TransformingBoundedHashSet; -import net.helix.hlx.utils.collections.impl.TransformingMap; -import net.helix.hlx.utils.collections.interfaces.BoundedSet; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; +package net.helix.pendulum.service.tipselection.impl; + +import net.helix.pendulum.controllers.ApproveeViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashId; +import net.helix.pendulum.model.HashPrefix; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.tipselection.RatingCalculator; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.collections.impl.TransformingBoundedHashSet; +import net.helix.pendulum.utils.collections.impl.TransformingMap; +import net.helix.pendulum.utils.collections.interfaces.BoundedSet; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.SetUtils; import org.slf4j.Logger; diff --git a/src/main/java/net/helix/hlx/service/tipselection/impl/EntryPointSelectorImpl.java b/src/main/java/net/helix/pendulum/service/tipselection/impl/EntryPointSelectorImpl.java similarity index 83% rename from src/main/java/net/helix/hlx/service/tipselection/impl/EntryPointSelectorImpl.java rename to src/main/java/net/helix/pendulum/service/tipselection/impl/EntryPointSelectorImpl.java index 459e3153..40410797 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/impl/EntryPointSelectorImpl.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/impl/EntryPointSelectorImpl.java @@ -1,11 +1,11 @@ -package net.helix.hlx.service.tipselection.impl; +package net.helix.pendulum.service.tipselection.impl; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.tipselection.EntryPointSelector; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.tipselection.EntryPointSelector; +import net.helix.pendulum.storage.Tangle; /** diff --git a/src/main/java/net/helix/hlx/service/tipselection/impl/RatingOne.java b/src/main/java/net/helix/pendulum/service/tipselection/impl/RatingOne.java similarity index 73% rename from src/main/java/net/helix/hlx/service/tipselection/impl/RatingOne.java rename to src/main/java/net/helix/pendulum/service/tipselection/impl/RatingOne.java index 2bebd6ce..cb3862c8 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/impl/RatingOne.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/impl/RatingOne.java @@ -1,12 +1,12 @@ -package net.helix.hlx.service.tipselection.impl; - -import net.helix.hlx.controllers.ApproveeViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashId; -import net.helix.hlx.service.tipselection.RatingCalculator; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.collections.impl.TransformingMap; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; +package net.helix.pendulum.service.tipselection.impl; + +import net.helix.pendulum.controllers.ApproveeViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashId; +import net.helix.pendulum.service.tipselection.RatingCalculator; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.collections.impl.TransformingMap; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; import java.util.LinkedList; import java.util.Queue; diff --git a/src/main/java/net/helix/hlx/service/tipselection/impl/TailFinderImpl.java b/src/main/java/net/helix/pendulum/service/tipselection/impl/TailFinderImpl.java similarity index 86% rename from src/main/java/net/helix/hlx/service/tipselection/impl/TailFinderImpl.java rename to src/main/java/net/helix/pendulum/service/tipselection/impl/TailFinderImpl.java index d3f58d5c..f4615517 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/impl/TailFinderImpl.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/impl/TailFinderImpl.java @@ -1,9 +1,9 @@ -package net.helix.hlx.service.tipselection.impl; +package net.helix.pendulum.service.tipselection.impl; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.tipselection.TailFinder; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.tipselection.TailFinder; +import net.helix.pendulum.storage.Tangle; import java.util.Optional; import java.util.Set; diff --git a/src/main/java/net/helix/hlx/service/tipselection/impl/TipSelectorImpl.java b/src/main/java/net/helix/pendulum/service/tipselection/impl/TipSelectorImpl.java similarity index 91% rename from src/main/java/net/helix/hlx/service/tipselection/impl/TipSelectorImpl.java rename to src/main/java/net/helix/pendulum/service/tipselection/impl/TipSelectorImpl.java index ccbb4221..1edfa9c9 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/impl/TipSelectorImpl.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/impl/TipSelectorImpl.java @@ -1,14 +1,14 @@ -package net.helix.hlx.service.tipselection.impl; - -import net.helix.hlx.conf.TipSelConfig; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashId; -import net.helix.hlx.service.ledger.LedgerService; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.tipselection.*; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; +package net.helix.pendulum.service.tipselection.impl; + +import net.helix.pendulum.conf.TipSelConfig; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashId; +import net.helix.pendulum.service.ledger.LedgerService; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.tipselection.*; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/service/tipselection/impl/WalkValidatorImpl.java b/src/main/java/net/helix/pendulum/service/tipselection/impl/WalkValidatorImpl.java similarity index 93% rename from src/main/java/net/helix/hlx/service/tipselection/impl/WalkValidatorImpl.java rename to src/main/java/net/helix/pendulum/service/tipselection/impl/WalkValidatorImpl.java index 4bbb0eb1..a73c5e2a 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/impl/WalkValidatorImpl.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/impl/WalkValidatorImpl.java @@ -1,12 +1,12 @@ -package net.helix.hlx.service.tipselection.impl; +package net.helix.pendulum.service.tipselection.impl; -import net.helix.hlx.conf.TipSelConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.ledger.LedgerService; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.tipselection.WalkValidator; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.conf.TipSelConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.ledger.LedgerService; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.tipselection.WalkValidator; +import net.helix.pendulum.storage.Tangle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/service/tipselection/impl/WalkerAlpha.java b/src/main/java/net/helix/pendulum/service/tipselection/impl/WalkerAlpha.java similarity index 91% rename from src/main/java/net/helix/hlx/service/tipselection/impl/WalkerAlpha.java rename to src/main/java/net/helix/pendulum/service/tipselection/impl/WalkerAlpha.java index 239487fa..c4789a1f 100644 --- a/src/main/java/net/helix/hlx/service/tipselection/impl/WalkerAlpha.java +++ b/src/main/java/net/helix/pendulum/service/tipselection/impl/WalkerAlpha.java @@ -1,14 +1,14 @@ -package net.helix.hlx.service.tipselection.impl; - -import net.helix.hlx.conf.TipSelConfig; -import net.helix.hlx.controllers.ApproveeViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashId; -import net.helix.hlx.service.tipselection.TailFinder; -import net.helix.hlx.service.tipselection.WalkValidator; -import net.helix.hlx.service.tipselection.Walker; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; +package net.helix.pendulum.service.tipselection.impl; + +import net.helix.pendulum.conf.TipSelConfig; +import net.helix.pendulum.controllers.ApproveeViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashId; +import net.helix.pendulum.service.tipselection.TailFinder; +import net.helix.pendulum.service.tipselection.WalkValidator; +import net.helix.pendulum.service.tipselection.Walker; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/TransactionPruner.java b/src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPruner.java similarity index 85% rename from src/main/java/net/helix/hlx/service/transactionpruning/TransactionPruner.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPruner.java index 59cdfe5d..46f63258 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/TransactionPruner.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPruner.java @@ -1,8 +1,8 @@ -package net.helix.hlx.service.transactionpruning; +package net.helix.pendulum.service.transactionpruning; /** * Represents the manager for the cleanup jobs that are issued by the - * {@link net.helix.hlx.service.snapshot.LocalSnapshotManager} in connection with local snapshots and eventually other + * {@link net.helix.pendulum.service.snapshot.LocalSnapshotManager} in connection with local snapshots and eventually other * parts of the code. */ public interface TransactionPruner { @@ -11,8 +11,8 @@ public interface TransactionPruner { * method. * * In addition to adding the jobs to the internal list of jobs that have to be executed, it informs the job about - * the {@link TransactionPruner}, the {@link net.helix.hlx.storage.Tangle}, the - * {@link net.helix.hlx.controllers.TipsViewModel} and the {@link net.helix.hlx.service.snapshot.Snapshot} instances + * the {@link TransactionPruner}, the {@link net.helix.pendulum.storage.Tangle}, the + * {@link net.helix.pendulum.controllers.TipsViewModel} and the {@link net.helix.pendulum.service.snapshot.Snapshot} instances * that this job is working on. * * @param job the job that shall be executed diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/TransactionPrunerJob.java b/src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPrunerJob.java similarity index 94% rename from src/main/java/net/helix/hlx/service/transactionpruning/TransactionPrunerJob.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPrunerJob.java index a163946c..c2bd5ea5 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/TransactionPrunerJob.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPrunerJob.java @@ -1,9 +1,9 @@ -package net.helix.hlx.service.transactionpruning; +package net.helix.pendulum.service.transactionpruning; -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.service.snapshot.Snapshot; -import net.helix.hlx.service.spentaddresses.SpentAddressesService; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.service.snapshot.Snapshot; +import net.helix.pendulum.service.spentaddresses.SpentAddressesService; +import net.helix.pendulum.storage.Tangle; /** * Represents the basic contract for a job that get processed by the {@link TransactionPruner}. diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/TransactionPrunerJobStatus.java b/src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPrunerJobStatus.java similarity index 76% rename from src/main/java/net/helix/hlx/service/transactionpruning/TransactionPrunerJobStatus.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPrunerJobStatus.java index 501c8100..6cd42c0e 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/TransactionPrunerJobStatus.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPrunerJobStatus.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.transactionpruning; +package net.helix.pendulum.service.transactionpruning; /** * Represents the different states a {@link TransactionPrunerJob} can be in. diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/TransactionPruningException.java b/src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPruningException.java similarity index 95% rename from src/main/java/net/helix/hlx/service/transactionpruning/TransactionPruningException.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPruningException.java index 705c3023..eb7ce4c1 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/TransactionPruningException.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/TransactionPruningException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.transactionpruning; +package net.helix.pendulum.service.transactionpruning; /** * This class is used to wrap exceptions that are specific to the transaction pruning logic. diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/async/AsyncTransactionPruner.java b/src/main/java/net/helix/pendulum/service/transactionpruning/async/AsyncTransactionPruner.java similarity index 94% rename from src/main/java/net/helix/hlx/service/transactionpruning/async/AsyncTransactionPruner.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/async/AsyncTransactionPruner.java index fb043d57..50b61442 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/async/AsyncTransactionPruner.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/async/AsyncTransactionPruner.java @@ -1,17 +1,17 @@ -package net.helix.hlx.service.transactionpruning.async; - -import net.helix.hlx.conf.SnapshotConfig; -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.spentaddresses.SpentAddressesService; -import net.helix.hlx.service.transactionpruning.TransactionPruner; -import net.helix.hlx.service.transactionpruning.TransactionPrunerJob; -import net.helix.hlx.service.transactionpruning.TransactionPruningException; -import net.helix.hlx.service.transactionpruning.jobs.MilestonePrunerJob; -import net.helix.hlx.service.transactionpruning.jobs.UnconfirmedSubtanglePrunerJob; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.thread.ThreadIdentifier; -import net.helix.hlx.utils.thread.ThreadUtils; +package net.helix.pendulum.service.transactionpruning.async; + +import net.helix.pendulum.conf.SnapshotConfig; +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.spentaddresses.SpentAddressesService; +import net.helix.pendulum.service.transactionpruning.TransactionPruner; +import net.helix.pendulum.service.transactionpruning.TransactionPrunerJob; +import net.helix.pendulum.service.transactionpruning.TransactionPruningException; +import net.helix.pendulum.service.transactionpruning.jobs.MilestonePrunerJob; +import net.helix.pendulum.service.transactionpruning.jobs.UnconfirmedSubtanglePrunerJob; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.thread.ThreadIdentifier; +import net.helix.pendulum.utils.thread.ThreadUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -398,7 +398,7 @@ private JobQueue getJobQueue(Class jobClass) thr * This method returns a file handle to state file. * * It constructs the path of the file by appending the corresponding file extension to the - * {@link net.helix.hlx.conf.BaseHelixConfig#localSnapshotsBasePath} config variable. If the path is relative, it + * {@link net.helix.pendulum.conf.BaseHelixConfig#localSnapshotsBasePath} config variable. If the path is relative, it * places the file relative to the current working directory, which is usually the location of the iri.jar. * * @return File handle to the state file. diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/async/JobQueue.java b/src/main/java/net/helix/pendulum/service/transactionpruning/async/JobQueue.java similarity index 81% rename from src/main/java/net/helix/hlx/service/transactionpruning/async/JobQueue.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/async/JobQueue.java index 446bda84..77942ca6 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/async/JobQueue.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/async/JobQueue.java @@ -1,7 +1,7 @@ -package net.helix.hlx.service.transactionpruning.async; +package net.helix.pendulum.service.transactionpruning.async; -import net.helix.hlx.service.transactionpruning.TransactionPrunerJob; -import net.helix.hlx.service.transactionpruning.TransactionPruningException; +import net.helix.pendulum.service.transactionpruning.TransactionPrunerJob; +import net.helix.pendulum.service.transactionpruning.TransactionPruningException; import java.util.stream.Stream; diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/async/MilestonePrunerJobQueue.java b/src/main/java/net/helix/pendulum/service/transactionpruning/async/MilestonePrunerJobQueue.java similarity index 93% rename from src/main/java/net/helix/hlx/service/transactionpruning/async/MilestonePrunerJobQueue.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/async/MilestonePrunerJobQueue.java index 32e39714..3dc92a7c 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/async/MilestonePrunerJobQueue.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/async/MilestonePrunerJobQueue.java @@ -1,10 +1,10 @@ -package net.helix.hlx.service.transactionpruning.async; +package net.helix.pendulum.service.transactionpruning.async; -import net.helix.hlx.conf.SnapshotConfig; -import net.helix.hlx.service.transactionpruning.TransactionPruner; -import net.helix.hlx.service.transactionpruning.TransactionPrunerJobStatus; -import net.helix.hlx.service.transactionpruning.TransactionPruningException; -import net.helix.hlx.service.transactionpruning.jobs.MilestonePrunerJob; +import net.helix.pendulum.conf.SnapshotConfig; +import net.helix.pendulum.service.transactionpruning.TransactionPruner; +import net.helix.pendulum.service.transactionpruning.TransactionPrunerJobStatus; +import net.helix.pendulum.service.transactionpruning.TransactionPruningException; +import net.helix.pendulum.service.transactionpruning.jobs.MilestonePrunerJob; import java.util.Deque; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/async/SimpleJobQueue.java b/src/main/java/net/helix/pendulum/service/transactionpruning/async/SimpleJobQueue.java similarity index 91% rename from src/main/java/net/helix/hlx/service/transactionpruning/async/SimpleJobQueue.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/async/SimpleJobQueue.java index bae6ff56..cc9719bc 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/async/SimpleJobQueue.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/async/SimpleJobQueue.java @@ -1,8 +1,8 @@ -package net.helix.hlx.service.transactionpruning.async; +package net.helix.pendulum.service.transactionpruning.async; -import net.helix.hlx.service.transactionpruning.TransactionPruner; -import net.helix.hlx.service.transactionpruning.TransactionPrunerJob; -import net.helix.hlx.service.transactionpruning.TransactionPruningException; +import net.helix.pendulum.service.transactionpruning.TransactionPruner; +import net.helix.pendulum.service.transactionpruning.TransactionPrunerJob; +import net.helix.pendulum.service.transactionpruning.TransactionPruningException; import java.util.Deque; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/jobs/AbstractTransactionPrunerJob.java b/src/main/java/net/helix/pendulum/service/transactionpruning/jobs/AbstractTransactionPrunerJob.java similarity index 83% rename from src/main/java/net/helix/hlx/service/transactionpruning/jobs/AbstractTransactionPrunerJob.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/jobs/AbstractTransactionPrunerJob.java index 7926df06..8f4a2cab 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/jobs/AbstractTransactionPrunerJob.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/jobs/AbstractTransactionPrunerJob.java @@ -1,12 +1,12 @@ -package net.helix.hlx.service.transactionpruning.jobs; -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.service.snapshot.Snapshot; -import net.helix.hlx.service.spentaddresses.SpentAddressesService; -import net.helix.hlx.service.transactionpruning.TransactionPruner; -import net.helix.hlx.service.transactionpruning.TransactionPrunerJob; -import net.helix.hlx.service.transactionpruning.TransactionPrunerJobStatus; -import net.helix.hlx.service.transactionpruning.TransactionPruningException; -import net.helix.hlx.storage.Tangle; +package net.helix.pendulum.service.transactionpruning.jobs; +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.service.snapshot.Snapshot; +import net.helix.pendulum.service.spentaddresses.SpentAddressesService; +import net.helix.pendulum.service.transactionpruning.TransactionPruner; +import net.helix.pendulum.service.transactionpruning.TransactionPrunerJob; +import net.helix.pendulum.service.transactionpruning.TransactionPrunerJobStatus; +import net.helix.pendulum.service.transactionpruning.TransactionPruningException; +import net.helix.pendulum.storage.Tangle; /** * Implements the most basic functionality that is shared by the different kinds of jobs. diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/jobs/MilestonePrunerJob.java b/src/main/java/net/helix/pendulum/service/transactionpruning/jobs/MilestonePrunerJob.java similarity index 91% rename from src/main/java/net/helix/hlx/service/transactionpruning/jobs/MilestonePrunerJob.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/jobs/MilestonePrunerJob.java index fc6478f9..7be34c2d 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/jobs/MilestonePrunerJob.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/jobs/MilestonePrunerJob.java @@ -1,28 +1,26 @@ -package net.helix.hlx.service.transactionpruning.jobs; - -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.IntegerIndex; -import net.helix.hlx.model.persistables.Round; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.service.transactionpruning.TransactionPrunerJobStatus; -import net.helix.hlx.service.transactionpruning.TransactionPruningException; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.utils.Pair; -import net.helix.hlx.utils.dag.DAGHelper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +package net.helix.pendulum.service.transactionpruning.jobs; + +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.IntegerIndex; +import net.helix.pendulum.model.persistables.Round; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.service.transactionpruning.TransactionPrunerJobStatus; +import net.helix.pendulum.service.transactionpruning.TransactionPruningException; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.utils.Pair; +import net.helix.pendulum.utils.dag.DAGHelper; import java.util.ArrayList; import java.util.List; /** - * Represents a cleanup job for {@link net.helix.hlx.service.transactionpruning.TransactionPruner}s that removes + * Represents a cleanup job for {@link net.helix.pendulum.service.transactionpruning.TransactionPruner}s that removes * milestones and all of their directly and indirectly referenced transactions (and the orphaned subtangles branching * off of the deleted transactions). * - * It is used by the {@link net.helix.hlx.service.snapshot.LocalSnapshotManager} to clean up milestones prior to a + * It is used by the {@link net.helix.pendulum.service.snapshot.LocalSnapshotManager} to clean up milestones prior to a * snapshot. Even though it defines a range of milestones that shall be deleted, it gets processed one milestone at a * time, persisting the progress after each step. */ @@ -82,7 +80,7 @@ public MilestonePrunerJob(int startingIndex, int targetIndex) { * progressed already to the given {@code currentIndex}. * * Since cleanup jobs can be consolidated (to reduce the size of the - * {@link net.helix.hlx.service.transactionpruning.TransactionPruner} state file) and restored (after IRI restarts), + * {@link net.helix.pendulum.service.transactionpruning.TransactionPruner} state file) and restored (after IRI restarts), * we need to be able provide both parameters even tho the job usually always "starts" with its {@code currentIndex} * being equal to the {@code startingIndex}. * diff --git a/src/main/java/net/helix/hlx/service/transactionpruning/jobs/UnconfirmedSubtanglePrunerJob.java b/src/main/java/net/helix/pendulum/service/transactionpruning/jobs/UnconfirmedSubtanglePrunerJob.java similarity index 83% rename from src/main/java/net/helix/hlx/service/transactionpruning/jobs/UnconfirmedSubtanglePrunerJob.java rename to src/main/java/net/helix/pendulum/service/transactionpruning/jobs/UnconfirmedSubtanglePrunerJob.java index d8309f07..b8de0c7e 100644 --- a/src/main/java/net/helix/hlx/service/transactionpruning/jobs/UnconfirmedSubtanglePrunerJob.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/jobs/UnconfirmedSubtanglePrunerJob.java @@ -1,15 +1,15 @@ -package net.helix.hlx.service.transactionpruning.jobs; +package net.helix.pendulum.service.transactionpruning.jobs; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.service.transactionpruning.TransactionPrunerJobStatus; -import net.helix.hlx.service.transactionpruning.TransactionPruningException; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.utils.Pair; -import net.helix.hlx.utils.dag.DAGHelper; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.service.transactionpruning.TransactionPrunerJobStatus; +import net.helix.pendulum.service.transactionpruning.TransactionPruningException; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.utils.Pair; +import net.helix.pendulum.utils.dag.DAGHelper; import java.util.Collection; import java.util.HashSet; @@ -17,7 +17,7 @@ import java.util.stream.Collectors; /** - * Represents a job for the {@link net.helix.hlx.service.transactionpruning.TransactionPruner} that cleans up all + * Represents a job for the {@link net.helix.pendulum.service.transactionpruning.TransactionPruner} that cleans up all * unconfirmed transactions approving a certain transaction. * * It is used to clean up orphaned subtangles when they become irrelevant for the ledger. diff --git a/src/main/java/net/helix/hlx/service/utils/RoundIndexUtil.java b/src/main/java/net/helix/pendulum/service/utils/RoundIndexUtil.java similarity index 87% rename from src/main/java/net/helix/hlx/service/utils/RoundIndexUtil.java rename to src/main/java/net/helix/pendulum/service/utils/RoundIndexUtil.java index 9b1e5d53..7bd932e5 100644 --- a/src/main/java/net/helix/hlx/service/utils/RoundIndexUtil.java +++ b/src/main/java/net/helix/pendulum/service/utils/RoundIndexUtil.java @@ -1,7 +1,7 @@ -package net.helix.hlx.service.utils; +package net.helix.pendulum.service.utils; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.utils.Serializer; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.utils.Serializer; public class RoundIndexUtil { diff --git a/src/main/java/net/helix/hlx/storage/Indexable.java b/src/main/java/net/helix/pendulum/storage/Indexable.java similarity index 94% rename from src/main/java/net/helix/hlx/storage/Indexable.java rename to src/main/java/net/helix/pendulum/storage/Indexable.java index bb7d3c70..3b19b06b 100644 --- a/src/main/java/net/helix/hlx/storage/Indexable.java +++ b/src/main/java/net/helix/pendulum/storage/Indexable.java @@ -1,4 +1,4 @@ -package net.helix.hlx.storage; +package net.helix.pendulum.storage; import java.io.Serializable; diff --git a/src/main/java/net/helix/hlx/storage/Persistable.java b/src/main/java/net/helix/pendulum/storage/Persistable.java similarity index 95% rename from src/main/java/net/helix/hlx/storage/Persistable.java rename to src/main/java/net/helix/pendulum/storage/Persistable.java index 95192bf4..e21dfbb8 100644 --- a/src/main/java/net/helix/hlx/storage/Persistable.java +++ b/src/main/java/net/helix/pendulum/storage/Persistable.java @@ -1,4 +1,4 @@ -package net.helix.hlx.storage; +package net.helix.pendulum.storage; import java.io.Serializable; diff --git a/src/main/java/net/helix/hlx/storage/PersistenceProvider.java b/src/main/java/net/helix/pendulum/storage/PersistenceProvider.java similarity index 96% rename from src/main/java/net/helix/hlx/storage/PersistenceProvider.java rename to src/main/java/net/helix/pendulum/storage/PersistenceProvider.java index cb993e52..320516f5 100644 --- a/src/main/java/net/helix/hlx/storage/PersistenceProvider.java +++ b/src/main/java/net/helix/pendulum/storage/PersistenceProvider.java @@ -1,6 +1,6 @@ -package net.helix.hlx.storage; +package net.helix.pendulum.storage; -import net.helix.hlx.utils.Pair; +import net.helix.pendulum.utils.Pair; import java.util.Collection; import java.util.List; diff --git a/src/main/java/net/helix/hlx/storage/Tangle.java b/src/main/java/net/helix/pendulum/storage/Tangle.java similarity index 94% rename from src/main/java/net/helix/hlx/storage/Tangle.java rename to src/main/java/net/helix/pendulum/storage/Tangle.java index b014889d..3792150d 100644 --- a/src/main/java/net/helix/hlx/storage/Tangle.java +++ b/src/main/java/net/helix/pendulum/storage/Tangle.java @@ -1,9 +1,9 @@ -package net.helix.hlx.storage; +package net.helix.pendulum.storage; -import net.helix.hlx.model.StateDiff; -import net.helix.hlx.model.persistables.*; -import net.helix.hlx.utils.Pair; -import net.helix.hlx.zmq.MessageQProvider; +import net.helix.pendulum.model.StateDiff; +import net.helix.pendulum.model.persistables.*; +import net.helix.pendulum.utils.Pair; +import net.helix.pendulum.zmq.MessageQProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,7 +41,7 @@ public void addPersistenceProvider(PersistenceProvider provider) { } /** - * Adds {@link net.helix.hlx.zmq.MessageQProvider} that should be notified. + * Adds {@link net.helix.pendulum.zmq.MessageQProvider} that should be notified. * @param provider that should be notified. */ public void addMessageQueueProvider(MessageQProvider provider) { @@ -134,11 +134,11 @@ private void updateMessageQueueProvider(Persistable model, Indexable index, Stri } /** - * Notifies all registered {@link net.helix.hlx.zmq.MessageQProvider} and publishes message to MessageQueue. + * Notifies all registered {@link net.helix.pendulum.zmq.MessageQProvider} and publishes message to MessageQueue. * * @param message that can be formatted by {@link String#format(String, Object...)} * @param objects that should replace the placeholder in message. - * @see net.helix.hlx.zmq.MessageQProviderImpl#publish(String, Object...) + * @see net.helix.pendulum.zmq.MessageQProviderImpl#publish(String, Object...) * @see String#format(String, Object...) */ public void publish(String message, Object... objects) { diff --git a/src/main/java/net/helix/hlx/storage/rocksdb/RocksDBPersistenceProvider.java b/src/main/java/net/helix/pendulum/storage/rocksdb/RocksDBPersistenceProvider.java similarity index 98% rename from src/main/java/net/helix/hlx/storage/rocksdb/RocksDBPersistenceProvider.java rename to src/main/java/net/helix/pendulum/storage/rocksdb/RocksDBPersistenceProvider.java index 59e787ce..c70e0620 100644 --- a/src/main/java/net/helix/hlx/storage/rocksdb/RocksDBPersistenceProvider.java +++ b/src/main/java/net/helix/pendulum/storage/rocksdb/RocksDBPersistenceProvider.java @@ -1,16 +1,14 @@ -package net.helix.hlx.storage.rocksdb; - -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.model.persistables.Round; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.storage.PersistenceProvider; -import net.helix.hlx.utils.HelixIOUtils; -import net.helix.hlx.utils.Pair; +package net.helix.pendulum.storage.rocksdb; + +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.storage.PersistenceProvider; +import net.helix.pendulum.utils.HelixIOUtils; +import net.helix.pendulum.utils.Pair; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.SystemUtils; -import org.bouncycastle.util.encoders.Hex; import org.rocksdb.*; import org.rocksdb.util.SizeUnit; import org.slf4j.Logger; @@ -20,7 +18,6 @@ import java.nio.file.Paths; import java.security.SecureRandom; import java.util.*; -import java.util.stream.Collectors; public class RocksDBPersistenceProvider implements PersistenceProvider { diff --git a/src/main/java/net/helix/hlx/utils/Converter.java b/src/main/java/net/helix/pendulum/utils/Converter.java similarity index 96% rename from src/main/java/net/helix/hlx/utils/Converter.java rename to src/main/java/net/helix/pendulum/utils/Converter.java index 34d01454..58b6b2a1 100644 --- a/src/main/java/net/helix/hlx/utils/Converter.java +++ b/src/main/java/net/helix/pendulum/utils/Converter.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils; +package net.helix.pendulum.utils; public class Converter { diff --git a/src/main/java/net/helix/hlx/utils/FastByteComparisons.java b/src/main/java/net/helix/pendulum/utils/FastByteComparisons.java similarity index 96% rename from src/main/java/net/helix/hlx/utils/FastByteComparisons.java rename to src/main/java/net/helix/pendulum/utils/FastByteComparisons.java index 16a9aa86..7fec06c4 100644 --- a/src/main/java/net/helix/hlx/utils/FastByteComparisons.java +++ b/src/main/java/net/helix/pendulum/utils/FastByteComparisons.java @@ -3,9 +3,9 @@ * https://github.com/ethereumj/ethereumj/blob/master/ethereumj-core/src/main/java/org/ethereum/util/FastByteComparisons.java * was updated to get rid of redundant dependencies */ -package net.helix.hlx.utils; +package net.helix.pendulum.utils; -import net.helix.hlx.exception.CouldNotObtainUnsafeInstanceException; +import net.helix.pendulum.exception.CouldNotObtainUnsafeInstanceException; import sun.misc.Unsafe; import java.lang.reflect.Field; diff --git a/src/main/java/net/helix/hlx/utils/HelixIOUtils.java b/src/main/java/net/helix/pendulum/utils/HelixIOUtils.java similarity index 98% rename from src/main/java/net/helix/hlx/utils/HelixIOUtils.java rename to src/main/java/net/helix/pendulum/utils/HelixIOUtils.java index 78761f0e..3af4be3e 100644 --- a/src/main/java/net/helix/hlx/utils/HelixIOUtils.java +++ b/src/main/java/net/helix/pendulum/utils/HelixIOUtils.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils; +package net.helix.pendulum.utils; import org.apache.commons.io.IOUtils; diff --git a/src/main/java/net/helix/hlx/utils/HelixUtils.java b/src/main/java/net/helix/pendulum/utils/HelixUtils.java similarity index 96% rename from src/main/java/net/helix/hlx/utils/HelixUtils.java rename to src/main/java/net/helix/pendulum/utils/HelixUtils.java index 96b330ed..c2382fb4 100644 --- a/src/main/java/net/helix/hlx/utils/HelixUtils.java +++ b/src/main/java/net/helix/pendulum/utils/HelixUtils.java @@ -1,6 +1,6 @@ -package net.helix.hlx.utils; +package net.helix.pendulum.utils; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.model.Hash; import org.apache.commons.lang3.StringUtils; import java.lang.reflect.Method; diff --git a/src/main/java/net/helix/hlx/utils/MapIdentityManager.java b/src/main/java/net/helix/pendulum/utils/MapIdentityManager.java similarity index 97% rename from src/main/java/net/helix/hlx/utils/MapIdentityManager.java rename to src/main/java/net/helix/pendulum/utils/MapIdentityManager.java index 02745bba..71f3932a 100644 --- a/src/main/java/net/helix/hlx/utils/MapIdentityManager.java +++ b/src/main/java/net/helix/pendulum/utils/MapIdentityManager.java @@ -1,10 +1,10 @@ -package net.helix.hlx.utils; +package net.helix.pendulum.utils; import io.undertow.security.idm.Account; import io.undertow.security.idm.Credential; import io.undertow.security.idm.IdentityManager; import io.undertow.security.idm.PasswordCredential; -import net.helix.hlx.crypto.Sha3; +import net.helix.pendulum.crypto.Sha3; import org.bouncycastle.util.encoders.Hex; import java.security.Principal; diff --git a/src/main/java/net/helix/hlx/utils/Pair.java b/src/main/java/net/helix/pendulum/utils/Pair.java similarity index 80% rename from src/main/java/net/helix/hlx/utils/Pair.java rename to src/main/java/net/helix/pendulum/utils/Pair.java index 168b0e7f..b0e27bff 100644 --- a/src/main/java/net/helix/hlx/utils/Pair.java +++ b/src/main/java/net/helix/pendulum/utils/Pair.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils; +package net.helix.pendulum.utils; public class Pair { public final S low; diff --git a/src/main/java/net/helix/hlx/utils/SafeUtils.java b/src/main/java/net/helix/pendulum/utils/SafeUtils.java similarity index 88% rename from src/main/java/net/helix/hlx/utils/SafeUtils.java rename to src/main/java/net/helix/pendulum/utils/SafeUtils.java index ef9863e9..a44b461f 100644 --- a/src/main/java/net/helix/hlx/utils/SafeUtils.java +++ b/src/main/java/net/helix/pendulum/utils/SafeUtils.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils; +package net.helix.pendulum.utils; import java.util.Collection; diff --git a/src/main/java/net/helix/hlx/utils/Serializer.java b/src/main/java/net/helix/pendulum/utils/Serializer.java similarity index 97% rename from src/main/java/net/helix/hlx/utils/Serializer.java rename to src/main/java/net/helix/pendulum/utils/Serializer.java index bca168f9..5df931e9 100644 --- a/src/main/java/net/helix/hlx/utils/Serializer.java +++ b/src/main/java/net/helix/pendulum/utils/Serializer.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils; +package net.helix.pendulum.utils; /** * Created by paul on 3/13/17 for iri. diff --git a/src/main/java/net/helix/hlx/utils/bundle/BundleTypes.java b/src/main/java/net/helix/pendulum/utils/bundle/BundleTypes.java similarity index 84% rename from src/main/java/net/helix/hlx/utils/bundle/BundleTypes.java rename to src/main/java/net/helix/pendulum/utils/bundle/BundleTypes.java index 3adca8d5..2e76d34f 100644 --- a/src/main/java/net/helix/hlx/utils/bundle/BundleTypes.java +++ b/src/main/java/net/helix/pendulum/utils/bundle/BundleTypes.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.bundle; +package net.helix.pendulum.utils.bundle; public enum BundleTypes { milestone, // vote diff --git a/src/main/java/net/helix/hlx/utils/bundle/BundleUtils.java b/src/main/java/net/helix/pendulum/utils/bundle/BundleUtils.java similarity index 95% rename from src/main/java/net/helix/hlx/utils/bundle/BundleUtils.java rename to src/main/java/net/helix/pendulum/utils/bundle/BundleUtils.java index 395c6336..5944ceb3 100644 --- a/src/main/java/net/helix/hlx/utils/bundle/BundleUtils.java +++ b/src/main/java/net/helix/pendulum/utils/bundle/BundleUtils.java @@ -1,12 +1,12 @@ -package net.helix.hlx.utils.bundle; - -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.Merkle; -import net.helix.hlx.crypto.Sponge; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.crypto.Winternitz; -import net.helix.hlx.model.Hash; -import net.helix.hlx.utils.Serializer; +package net.helix.pendulum.utils.bundle; + +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.Merkle; +import net.helix.pendulum.crypto.Sponge; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.crypto.Winternitz; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.utils.Serializer; import org.bouncycastle.util.encoders.Hex; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/utils/collections/impl/BoundedHashSet.java b/src/main/java/net/helix/pendulum/utils/collections/impl/BoundedHashSet.java similarity index 95% rename from src/main/java/net/helix/hlx/utils/collections/impl/BoundedHashSet.java rename to src/main/java/net/helix/pendulum/utils/collections/impl/BoundedHashSet.java index 0da57965..34349d92 100644 --- a/src/main/java/net/helix/hlx/utils/collections/impl/BoundedHashSet.java +++ b/src/main/java/net/helix/pendulum/utils/collections/impl/BoundedHashSet.java @@ -1,6 +1,6 @@ -package net.helix.hlx.utils.collections.impl; +package net.helix.pendulum.utils.collections.impl; -import net.helix.hlx.utils.collections.interfaces.BoundedSet; +import net.helix.pendulum.utils.collections.interfaces.BoundedSet; import java.util.Collection; import java.util.HashSet; diff --git a/src/main/java/net/helix/hlx/utils/collections/impl/TransformingBoundedHashSet.java b/src/main/java/net/helix/pendulum/utils/collections/impl/TransformingBoundedHashSet.java similarity index 95% rename from src/main/java/net/helix/hlx/utils/collections/impl/TransformingBoundedHashSet.java rename to src/main/java/net/helix/pendulum/utils/collections/impl/TransformingBoundedHashSet.java index 9325a77f..e28c7f6f 100644 --- a/src/main/java/net/helix/hlx/utils/collections/impl/TransformingBoundedHashSet.java +++ b/src/main/java/net/helix/pendulum/utils/collections/impl/TransformingBoundedHashSet.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.collections.impl; +package net.helix.pendulum.utils.collections.impl; import java.util.Collection; import java.util.function.UnaryOperator; diff --git a/src/main/java/net/helix/hlx/utils/collections/impl/TransformingMap.java b/src/main/java/net/helix/pendulum/utils/collections/impl/TransformingMap.java similarity index 94% rename from src/main/java/net/helix/hlx/utils/collections/impl/TransformingMap.java rename to src/main/java/net/helix/pendulum/utils/collections/impl/TransformingMap.java index fcc9194c..66ff340f 100644 --- a/src/main/java/net/helix/hlx/utils/collections/impl/TransformingMap.java +++ b/src/main/java/net/helix/pendulum/utils/collections/impl/TransformingMap.java @@ -1,6 +1,6 @@ -package net.helix.hlx.utils.collections.impl; +package net.helix.pendulum.utils.collections.impl; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/net/helix/hlx/utils/collections/interfaces/BoundedCollection.java b/src/main/java/net/helix/pendulum/utils/collections/interfaces/BoundedCollection.java similarity index 94% rename from src/main/java/net/helix/hlx/utils/collections/interfaces/BoundedCollection.java rename to src/main/java/net/helix/pendulum/utils/collections/interfaces/BoundedCollection.java index 18301ccb..07796626 100644 --- a/src/main/java/net/helix/hlx/utils/collections/interfaces/BoundedCollection.java +++ b/src/main/java/net/helix/pendulum/utils/collections/interfaces/BoundedCollection.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.collections.interfaces; +package net.helix.pendulum.utils.collections.interfaces; import java.util.Collection; diff --git a/src/main/java/net/helix/hlx/utils/collections/interfaces/BoundedSet.java b/src/main/java/net/helix/pendulum/utils/collections/interfaces/BoundedSet.java similarity index 78% rename from src/main/java/net/helix/hlx/utils/collections/interfaces/BoundedSet.java rename to src/main/java/net/helix/pendulum/utils/collections/interfaces/BoundedSet.java index 7bfae344..8ddd7d89 100644 --- a/src/main/java/net/helix/hlx/utils/collections/interfaces/BoundedSet.java +++ b/src/main/java/net/helix/pendulum/utils/collections/interfaces/BoundedSet.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.collections.interfaces; +package net.helix.pendulum.utils.collections.interfaces; import java.util.Set; diff --git a/src/main/java/net/helix/hlx/utils/collections/interfaces/UnIterableMap.java b/src/main/java/net/helix/pendulum/utils/collections/interfaces/UnIterableMap.java similarity index 94% rename from src/main/java/net/helix/hlx/utils/collections/interfaces/UnIterableMap.java rename to src/main/java/net/helix/pendulum/utils/collections/interfaces/UnIterableMap.java index a16f2fd0..acaa3709 100644 --- a/src/main/java/net/helix/hlx/utils/collections/interfaces/UnIterableMap.java +++ b/src/main/java/net/helix/pendulum/utils/collections/interfaces/UnIterableMap.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.collections.interfaces; +package net.helix.pendulum.utils.collections.interfaces; import java.util.Collection; import java.util.Map; diff --git a/src/main/java/net/helix/hlx/utils/dag/DAGHelper.java b/src/main/java/net/helix/pendulum/utils/dag/DAGHelper.java similarity index 98% rename from src/main/java/net/helix/hlx/utils/dag/DAGHelper.java rename to src/main/java/net/helix/pendulum/utils/dag/DAGHelper.java index 69e4dfc4..e880ab35 100644 --- a/src/main/java/net/helix/hlx/utils/dag/DAGHelper.java +++ b/src/main/java/net/helix/pendulum/utils/dag/DAGHelper.java @@ -1,9 +1,9 @@ -package net.helix.hlx.utils.dag; +package net.helix.pendulum.utils.dag; -import net.helix.hlx.controllers.ApproveeViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.controllers.ApproveeViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.storage.Tangle; import java.util.*; import java.util.function.Consumer; diff --git a/src/main/java/net/helix/hlx/utils/dag/TraversalException.java b/src/main/java/net/helix/pendulum/utils/dag/TraversalException.java similarity index 96% rename from src/main/java/net/helix/hlx/utils/dag/TraversalException.java rename to src/main/java/net/helix/pendulum/utils/dag/TraversalException.java index a58c8d70..503b24ee 100644 --- a/src/main/java/net/helix/hlx/utils/dag/TraversalException.java +++ b/src/main/java/net/helix/pendulum/utils/dag/TraversalException.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.dag; +package net.helix.pendulum.utils.dag; /** * This class is used to wrap exceptions that are specific to traversing the graph. diff --git a/src/main/java/net/helix/hlx/utils/log/Logger.java b/src/main/java/net/helix/pendulum/utils/log/Logger.java similarity index 98% rename from src/main/java/net/helix/hlx/utils/log/Logger.java rename to src/main/java/net/helix/pendulum/utils/log/Logger.java index d185641d..d66323a3 100644 --- a/src/main/java/net/helix/hlx/utils/log/Logger.java +++ b/src/main/java/net/helix/pendulum/utils/log/Logger.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.log; +package net.helix.pendulum.utils.log; /** * Represents a wrapper for the logback Logger, which allows us to add aditional features to the logging capabilities of diff --git a/src/main/java/net/helix/hlx/utils/log/ProgressLogger.java b/src/main/java/net/helix/pendulum/utils/log/ProgressLogger.java similarity index 99% rename from src/main/java/net/helix/hlx/utils/log/ProgressLogger.java rename to src/main/java/net/helix/pendulum/utils/log/ProgressLogger.java index 3442a64f..e2fdab99 100644 --- a/src/main/java/net/helix/hlx/utils/log/ProgressLogger.java +++ b/src/main/java/net/helix/pendulum/utils/log/ProgressLogger.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.log; +package net.helix.pendulum.utils.log; import org.slf4j.Logger; diff --git a/src/main/java/net/helix/hlx/utils/log/interval/IntervalLogger.java b/src/main/java/net/helix/pendulum/utils/log/interval/IntervalLogger.java similarity index 99% rename from src/main/java/net/helix/hlx/utils/log/interval/IntervalLogger.java rename to src/main/java/net/helix/pendulum/utils/log/interval/IntervalLogger.java index a5ac08ec..285c8f27 100644 --- a/src/main/java/net/helix/hlx/utils/log/interval/IntervalLogger.java +++ b/src/main/java/net/helix/pendulum/utils/log/interval/IntervalLogger.java @@ -1,6 +1,6 @@ -package net.helix.hlx.utils.log.interval; +package net.helix.pendulum.utils.log.interval; -import net.helix.hlx.utils.log.Logger; +import net.helix.pendulum.utils.log.Logger; import org.slf4j.LoggerFactory; import java.util.Objects; diff --git a/src/main/java/net/helix/hlx/utils/log/interval/IntervalProgressLogger.java b/src/main/java/net/helix/pendulum/utils/log/interval/IntervalProgressLogger.java similarity index 98% rename from src/main/java/net/helix/hlx/utils/log/interval/IntervalProgressLogger.java rename to src/main/java/net/helix/pendulum/utils/log/interval/IntervalProgressLogger.java index 22398a14..3ec91520 100644 --- a/src/main/java/net/helix/hlx/utils/log/interval/IntervalProgressLogger.java +++ b/src/main/java/net/helix/pendulum/utils/log/interval/IntervalProgressLogger.java @@ -1,6 +1,6 @@ -package net.helix.hlx.utils.log.interval; +package net.helix.pendulum.utils.log.interval; -import net.helix.hlx.utils.log.ProgressLogger; +import net.helix.pendulum.utils.log.ProgressLogger; import org.slf4j.Logger; import java.text.DecimalFormat; diff --git a/src/main/java/net/helix/hlx/utils/thread/BoundedScheduledExecutorService.java b/src/main/java/net/helix/pendulum/utils/thread/BoundedScheduledExecutorService.java similarity index 99% rename from src/main/java/net/helix/hlx/utils/thread/BoundedScheduledExecutorService.java rename to src/main/java/net/helix/pendulum/utils/thread/BoundedScheduledExecutorService.java index 35d124da..86d41587 100644 --- a/src/main/java/net/helix/hlx/utils/thread/BoundedScheduledExecutorService.java +++ b/src/main/java/net/helix/pendulum/utils/thread/BoundedScheduledExecutorService.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.thread; +package net.helix.pendulum.utils.thread; import java.util.ArrayList; import java.util.Collection; @@ -14,7 +14,7 @@ * call (non-silent vs silent).
    *
    * Whenever a non-recurring task finishes (or a recurring one is cancelled through its {@link Future}), it makes space - * for a new task. This is useful for classes like the {@link net.helix.hlx.utils.log.interval.IntervalLogger} that want + * for a new task. This is useful for classes like the {@link net.helix.pendulum.utils.log.interval.IntervalLogger} that want * to delay an action if and only if there is no other delayed action queued already.
    *
    * Note: In contrast to other existing implementations like the SizedScheduledExecutorService of the apache package, diff --git a/src/main/java/net/helix/hlx/utils/thread/DedicatedScheduledExecutorService.java b/src/main/java/net/helix/pendulum/utils/thread/DedicatedScheduledExecutorService.java similarity index 97% rename from src/main/java/net/helix/hlx/utils/thread/DedicatedScheduledExecutorService.java rename to src/main/java/net/helix/pendulum/utils/thread/DedicatedScheduledExecutorService.java index be8b47f2..7880a8b9 100644 --- a/src/main/java/net/helix/hlx/utils/thread/DedicatedScheduledExecutorService.java +++ b/src/main/java/net/helix/pendulum/utils/thread/DedicatedScheduledExecutorService.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.thread; +package net.helix.pendulum.utils.thread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -125,7 +125,7 @@ public DedicatedScheduledExecutorService(String threadName, Logger logger) { * Does the same as {@link #DedicatedScheduledExecutorService(String, Logger, boolean)} but defaults to {@code null} * for the thread name (which causes only error messages to be printed - unless debug is true).
    *
    - * Note: This is for example used by the {@link net.helix.hlx.utils.log.interval.IntervalLogger} which does not want + * Note: This is for example used by the {@link net.helix.pendulum.utils.log.interval.IntervalLogger} which does not want * to inform the user when scheduling a log output, but which still needs the "only run one task" logic.
    * * @param logger logback logger that shall be used for the origin of the log messages @@ -151,7 +151,7 @@ public DedicatedScheduledExecutorService(String threadName) { * for the thread name (which causes only error messages to be printed - unless debug is true) and and false for the * debug flag.
    *
    - * Note: This is for example used by the {@link net.helix.hlx.utils.log.interval.IntervalLogger} which does not want + * Note: This is for example used by the {@link net.helix.pendulum.utils.log.interval.IntervalLogger} which does not want * to inform the user when scheduling a log output, but which still needs the "only run one task" logic.
    * * @param logger logback logger that shall be used for the origin of the log messages @@ -165,7 +165,7 @@ public DedicatedScheduledExecutorService(Logger logger) { * for the thread name (which causes only error messages to be printed - unless debug is true) and the * {@link #DEFAULT_LOGGER} for the log messages.
    *
    - * Note: This is for example used by the {@link net.helix.hlx.utils.log.interval.IntervalLogger} which does not want + * Note: This is for example used by the {@link net.helix.pendulum.utils.log.interval.IntervalLogger} which does not want * to inform the user when scheduling a log output, but which still needs the "only run one task" logic.
    * * @param debug debug flag that indicates if every "run" should be accompanied with a log message @@ -179,7 +179,7 @@ public DedicatedScheduledExecutorService(boolean debug) { * for the thread name (which causes only error messages to be printed), the {@link #DEFAULT_LOGGER} for the log * messages and {@code false} for the debug flag.
    *
    - * Note: This is for example used by the {@link net.helix.hlx.utils.log.interval.IntervalLogger} which does not want + * Note: This is for example used by the {@link net.helix.pendulum.utils.log.interval.IntervalLogger} which does not want * to inform the user when scheduling a log output, but which still needs the "only run one task" logic.
    */ public DedicatedScheduledExecutorService() { diff --git a/src/main/java/net/helix/hlx/utils/thread/ReportingExecutorService.java b/src/main/java/net/helix/pendulum/utils/thread/ReportingExecutorService.java similarity index 98% rename from src/main/java/net/helix/hlx/utils/thread/ReportingExecutorService.java rename to src/main/java/net/helix/pendulum/utils/thread/ReportingExecutorService.java index ff0a665f..3152974a 100644 --- a/src/main/java/net/helix/hlx/utils/thread/ReportingExecutorService.java +++ b/src/main/java/net/helix/pendulum/utils/thread/ReportingExecutorService.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.thread; +package net.helix.pendulum.utils.thread; /** * This interface defines a contract for {@link java.util.concurrent.ExecutorService}s that makes them call a diff --git a/src/main/java/net/helix/hlx/utils/thread/SilentScheduledExecutorService.java b/src/main/java/net/helix/pendulum/utils/thread/SilentScheduledExecutorService.java similarity index 99% rename from src/main/java/net/helix/hlx/utils/thread/SilentScheduledExecutorService.java rename to src/main/java/net/helix/pendulum/utils/thread/SilentScheduledExecutorService.java index 03409943..d8d6dd78 100644 --- a/src/main/java/net/helix/hlx/utils/thread/SilentScheduledExecutorService.java +++ b/src/main/java/net/helix/pendulum/utils/thread/SilentScheduledExecutorService.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.thread; +package net.helix.pendulum.utils.thread; import java.util.Collection; import java.util.List; diff --git a/src/main/java/net/helix/hlx/utils/thread/TaskDetails.java b/src/main/java/net/helix/pendulum/utils/thread/TaskDetails.java similarity index 99% rename from src/main/java/net/helix/hlx/utils/thread/TaskDetails.java rename to src/main/java/net/helix/pendulum/utils/thread/TaskDetails.java index 84f5bc9f..6e46f204 100644 --- a/src/main/java/net/helix/hlx/utils/thread/TaskDetails.java +++ b/src/main/java/net/helix/pendulum/utils/thread/TaskDetails.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.thread; +package net.helix.pendulum.utils.thread; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/net/helix/hlx/utils/thread/ThreadIdentifier.java b/src/main/java/net/helix/pendulum/utils/thread/ThreadIdentifier.java similarity index 96% rename from src/main/java/net/helix/hlx/utils/thread/ThreadIdentifier.java rename to src/main/java/net/helix/pendulum/utils/thread/ThreadIdentifier.java index 1df40da5..04c98e8c 100644 --- a/src/main/java/net/helix/hlx/utils/thread/ThreadIdentifier.java +++ b/src/main/java/net/helix/pendulum/utils/thread/ThreadIdentifier.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.thread; +package net.helix.pendulum.utils.thread; /** * The instances of this class are used by the {@link ThreadUtils} to map the {@link Thread}s and make the corresponding diff --git a/src/main/java/net/helix/hlx/utils/thread/ThreadUtils.java b/src/main/java/net/helix/pendulum/utils/thread/ThreadUtils.java similarity index 99% rename from src/main/java/net/helix/hlx/utils/thread/ThreadUtils.java rename to src/main/java/net/helix/pendulum/utils/thread/ThreadUtils.java index 0fee96a7..1739c710 100644 --- a/src/main/java/net/helix/hlx/utils/thread/ThreadUtils.java +++ b/src/main/java/net/helix/pendulum/utils/thread/ThreadUtils.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.thread; +package net.helix.pendulum.utils.thread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/net/helix/hlx/zmq/MessageQ.java b/src/main/java/net/helix/pendulum/zmq/MessageQ.java similarity index 93% rename from src/main/java/net/helix/hlx/zmq/MessageQ.java rename to src/main/java/net/helix/pendulum/zmq/MessageQ.java index a5a0ead6..ab3a4a94 100644 --- a/src/main/java/net/helix/hlx/zmq/MessageQ.java +++ b/src/main/java/net/helix/pendulum/zmq/MessageQ.java @@ -1,7 +1,7 @@ -package net.helix.hlx.zmq; +package net.helix.pendulum.zmq; -import net.helix.hlx.conf.ZMQConfig; -import net.helix.hlx.utils.HelixIOUtils; +import net.helix.pendulum.conf.ZMQConfig; +import net.helix.pendulum.utils.HelixIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.zeromq.ZMQ; diff --git a/src/main/java/net/helix/hlx/zmq/MessageQProvider.java b/src/main/java/net/helix/pendulum/zmq/MessageQProvider.java similarity index 80% rename from src/main/java/net/helix/hlx/zmq/MessageQProvider.java rename to src/main/java/net/helix/pendulum/zmq/MessageQProvider.java index 4db8f043..0c97ce9e 100644 --- a/src/main/java/net/helix/hlx/zmq/MessageQProvider.java +++ b/src/main/java/net/helix/pendulum/zmq/MessageQProvider.java @@ -1,9 +1,9 @@ -package net.helix.hlx.zmq; +package net.helix.pendulum.zmq; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; /** * Publish messages to the MessageQueue. diff --git a/src/main/java/net/helix/hlx/zmq/MessageQProviderImpl.java b/src/main/java/net/helix/pendulum/zmq/MessageQProviderImpl.java similarity index 93% rename from src/main/java/net/helix/hlx/zmq/MessageQProviderImpl.java rename to src/main/java/net/helix/pendulum/zmq/MessageQProviderImpl.java index df2c82ee..5ea6d6d8 100644 --- a/src/main/java/net/helix/hlx/zmq/MessageQProviderImpl.java +++ b/src/main/java/net/helix/pendulum/zmq/MessageQProviderImpl.java @@ -1,11 +1,11 @@ -package net.helix.hlx.zmq; - -import net.helix.hlx.conf.ZMQConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; +package net.helix.pendulum.zmq; + +import net.helix.pendulum.conf.ZMQConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; import org.bouncycastle.util.encoders.Hex; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/RocksDbBenchmark.java b/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/RocksDbBenchmark.java deleted file mode 100644 index a563b504..00000000 --- a/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/RocksDbBenchmark.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.helix.hlx.benchmarks.dbbenchmark; - -import net.helix.hlx.benchmarks.dbbenchmark.states.EmptyState; -import net.helix.hlx.benchmarks.dbbenchmark.states.FullState; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.utils.Pair; -import org.openjdk.jmh.annotations.Benchmark; - -public class RocksDbBenchmark { - @Benchmark - public void persistOneByOne(EmptyState state) throws Exception { - for (TransactionViewModel tvm: state.getTransactions()) { - tvm.store(state.getTangle(), state.getSnapshotProvider().getInitialSnapshot()); - } - } - - @Benchmark - public void deleteOneByOne(FullState state) throws Exception { - for (TransactionViewModel tvm : state.getTransactions()) { - tvm.delete(state.getTangle()); - } - } - - @Benchmark - public void dropAll(FullState state) throws Exception { - state.getTangle().clearColumn(Transaction.class); - state.getTangle().clearMetadata(Transaction.class); - } - - @Benchmark - public void deleteBatch(FullState state) throws Exception { - state.getTangle().deleteBatch(state.getPairs()); - } - - @Benchmark - public void fetchOneByOne(FullState state) throws Exception { - for (Pair> pair : state.getPairs()) { - state.getTangle().load(pair.hi, pair.low); - } - } -} diff --git a/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/DbState.java b/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/DbState.java deleted file mode 100644 index 45eb8be5..00000000 --- a/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/DbState.java +++ /dev/null @@ -1,85 +0,0 @@ -package net.helix.hlx.benchmarks.dbbenchmark.states; - -import net.helix.hlx.TransactionTestUtils; -import net.helix.hlx.conf.BaseHelixConfig; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.storage.PersistenceProvider; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; -import org.apache.commons.io.FileUtils; -import org.openjdk.jmh.annotations.Param; -import org.openjdk.jmh.annotations.Scope; -import org.openjdk.jmh.annotations.State; - -import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -@State(Scope.Benchmark) -public abstract class DbState { - private final File dbFolder = new File("db-bench"); - private final File logFolder = new File("db-log-bench"); - - private Tangle tangle; - private SnapshotProvider snapshotProvider; - private List transactions; - - @Param({"10", "100", "500", "1000", "3000"}) - private int numTxsToTest; - - public void setUp() throws Exception { - System.out.println("-----------------------trial setup--------------------------------"); - boolean mkdirs = dbFolder.mkdirs(); - if (!mkdirs) { - throw new IllegalStateException("db didn't start with a clean slate. Please delete " - + dbFolder.getAbsolutePath()); - } - logFolder.mkdirs(); - PersistenceProvider dbProvider = new RocksDBPersistenceProvider( - dbFolder.getAbsolutePath(), logFolder.getAbsolutePath(), BaseHelixConfig.Defaults.DB_CACHE_SIZE, Tangle.COLUMN_FAMILIES, Tangle.METADATA_COLUMN_FAMILY); - dbProvider.init(); - tangle = new Tangle(); - snapshotProvider = new SnapshotProviderImpl().init(new MainnetConfig()); - tangle.addPersistenceProvider(dbProvider); - String hex = ""; - System.out.println("numTxsToTest = [" + numTxsToTest + "]"); - transactions = new ArrayList<>(numTxsToTest); - for (int i = 0; i < numTxsToTest; i++) { - hex = TransactionTestUtils.nextWord(hex, i); - TransactionViewModel tvm = TransactionTestUtils.createTransactionWithHex(hex); - transactions.add(tvm); - } - transactions = Collections.unmodifiableList(transactions); - } - - public void shutdown() throws Exception { - System.out.println("-----------------------trial shutdown--------------------------------"); - tangle.shutdown(); - snapshotProvider.shutdown(); - FileUtils.forceDelete(dbFolder); - FileUtils.forceDelete(logFolder); - } - - public void clearDb() throws Exception { - System.out.println("-----------------------iteration shutdown--------------------------------"); - tangle.clearColumn(Transaction.class); - tangle.clearMetadata(Transaction.class); - } - - public Tangle getTangle() { - return tangle; - } - - public SnapshotProvider getSnapshotProvider() { - return snapshotProvider; - } - - public List getTransactions() { - return transactions; - } -} diff --git a/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/EmptyState.java b/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/EmptyState.java deleted file mode 100644 index 82511c7c..00000000 --- a/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/EmptyState.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.helix.hlx.benchmarks.dbbenchmark.states; - -import org.openjdk.jmh.annotations.*; - -@State(Scope.Benchmark) -public class EmptyState extends DbState { - - @Override - @Setup(Level.Trial) - public void setUp() throws Exception { - super.setUp(); - } - - @Override - @TearDown(Level.Trial) - public void shutdown() throws Exception { - super.shutdown(); - } - - @Override - @TearDown(Level.Iteration) - public void clearDb() throws Exception { - super.clearDb(); - } - -} \ No newline at end of file diff --git a/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/FullState.java b/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/FullState.java deleted file mode 100644 index 1a872517..00000000 --- a/src/test/java/net/helix/hlx/benchmarks/dbbenchmark/states/FullState.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.helix.hlx.benchmarks.dbbenchmark.states; - -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.utils.Pair; -import org.openjdk.jmh.annotations.*; - -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; - -@State(Scope.Benchmark) -public class FullState extends DbState { - - private List>> pairs; - - @Override - @Setup(Level.Trial) - public void setUp() throws Exception { - super.setUp(); - pairs = getTransactions().stream() - .map(tvm -> new Pair<>((Indexable) tvm.getHash(), Transaction.class)) - .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList)); - - } - - @Override - @TearDown(Level.Trial) - public void shutdown() throws Exception { - super.shutdown(); - } - - @Override - @TearDown(Level.Iteration) - public void clearDb() throws Exception { - super.clearDb(); - } - - @Setup(Level.Iteration) - public void populateDb() throws Exception { - System.out.println("-----------------------iteration setup--------------------------------"); - for (TransactionViewModel tvm : getTransactions()) { - tvm.store(getTangle(), getSnapshotProvider().getInitialSnapshot()); - } - } - - public List>> getPairs() { - return pairs; - } -} diff --git a/src/test/java/net/helix/hlx/BundleValidatorTest.java b/src/test/java/net/helix/pendulum/BundleValidatorTest.java similarity index 96% rename from src/test/java/net/helix/hlx/BundleValidatorTest.java rename to src/test/java/net/helix/pendulum/BundleValidatorTest.java index 9d52b6c9..97b393a6 100644 --- a/src/test/java/net/helix/hlx/BundleValidatorTest.java +++ b/src/test/java/net/helix/pendulum/BundleValidatorTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx; +package net.helix.pendulum; import java.util.Arrays; import java.util.List; @@ -11,14 +11,14 @@ import org.junit.Assert; import org.junit.rules.TemporaryFolder; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.TransactionHash; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; -import net.helix.hlx.controllers.TransactionViewModel; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.TransactionHash; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; +import net.helix.pendulum.controllers.TransactionViewModel; public class BundleValidatorTest { diff --git a/src/test/java/net/helix/hlx/HelixTest.java b/src/test/java/net/helix/pendulum/HelixTest.java similarity index 50% rename from src/test/java/net/helix/hlx/HelixTest.java rename to src/test/java/net/helix/pendulum/HelixTest.java index f76c910b..7f6b09a5 100644 --- a/src/test/java/net/helix/hlx/HelixTest.java +++ b/src/test/java/net/helix/pendulum/HelixTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx; +package net.helix.pendulum; public class HelixTest { } diff --git a/src/test/java/net/helix/hlx/TangleMockUtils.java b/src/test/java/net/helix/pendulum/TangleMockUtils.java similarity index 89% rename from src/test/java/net/helix/hlx/TangleMockUtils.java rename to src/test/java/net/helix/pendulum/TangleMockUtils.java index c7272e5a..d64d8fa3 100644 --- a/src/test/java/net/helix/hlx/TangleMockUtils.java +++ b/src/test/java/net/helix/pendulum/TangleMockUtils.java @@ -1,16 +1,16 @@ -package net.helix.hlx; +package net.helix.pendulum; import java.util.Map; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.IntegerIndex; -import net.helix.hlx.model.StateDiff; -import net.helix.hlx.model.persistables.Round; -import net.helix.hlx.model.persistables.Milestone; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.utils.Pair; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.IntegerIndex; +import net.helix.pendulum.model.StateDiff; +import net.helix.pendulum.model.persistables.Round; +import net.helix.pendulum.model.persistables.Milestone; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.utils.Pair; import org.mockito.Mockito; diff --git a/src/test/java/net/helix/hlx/TransactionTestUtils.java b/src/test/java/net/helix/pendulum/TransactionTestUtils.java similarity index 96% rename from src/test/java/net/helix/hlx/TransactionTestUtils.java rename to src/test/java/net/helix/pendulum/TransactionTestUtils.java index 992f4657..3c49a824 100644 --- a/src/test/java/net/helix/hlx/TransactionTestUtils.java +++ b/src/test/java/net/helix/pendulum/TransactionTestUtils.java @@ -1,14 +1,14 @@ -package net.helix.hlx; +package net.helix.pendulum; import java.nio.ByteBuffer; import java.util.Random; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.TransactionHash; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.TransactionHash; -import net.helix.hlx.model.persistables.Transaction; +import net.helix.pendulum.model.persistables.Transaction; import org.apache.commons.lang3.StringUtils; import org.bouncycastle.util.encoders.Hex; @@ -229,7 +229,7 @@ public static Transaction createTransactionWithTrunkAndBranch(Hash trunk, Hash b public static Hash getTransactionHash() { byte[] out = getBytes(Hash.SIZE_IN_BYTES); - return net.helix.hlx.model.HashFactory.TRANSACTION.create(out); + return net.helix.pendulum.model.HashFactory.TRANSACTION.create(out); } /** diff --git a/src/test/java/net/helix/hlx/TransactionValidatorTest.java b/src/test/java/net/helix/pendulum/TransactionValidatorTest.java similarity index 94% rename from src/test/java/net/helix/hlx/TransactionValidatorTest.java rename to src/test/java/net/helix/pendulum/TransactionValidatorTest.java index 1cdc4336..648e1066 100644 --- a/src/test/java/net/helix/hlx/TransactionValidatorTest.java +++ b/src/test/java/net/helix/pendulum/TransactionValidatorTest.java @@ -1,22 +1,22 @@ -package net.helix.hlx; +package net.helix.pendulum; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.controllers.TipsViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.TransactionHash; -import net.helix.hlx.network.TransactionRequester; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; - -import static net.helix.hlx.TransactionTestUtils.*; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.controllers.TipsViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.TransactionHash; +import net.helix.pendulum.network.TransactionRequester; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; + +import static net.helix.pendulum.TransactionTestUtils.*; import static org.junit.Assert.*; diff --git a/src/test/java/net/helix/hlx/XITest.java b/src/test/java/net/helix/pendulum/XITest.java similarity index 92% rename from src/test/java/net/helix/hlx/XITest.java rename to src/test/java/net/helix/pendulum/XITest.java index ffc17215..8fc2321c 100644 --- a/src/test/java/net/helix/hlx/XITest.java +++ b/src/test/java/net/helix/pendulum/XITest.java @@ -1,4 +1,4 @@ -package net.helix.hlx; +package net.helix.pendulum; import java.lang.reflect.Field; import java.util.HashMap; @@ -12,9 +12,9 @@ import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import net.helix.hlx.service.CallableRequest; -import net.helix.hlx.service.dto.AbstractResponse; -import net.helix.hlx.service.dto.ErrorResponse; +import net.helix.pendulum.service.CallableRequest; +import net.helix.pendulum.service.dto.AbstractResponse; +import net.helix.pendulum.service.dto.ErrorResponse; /** * Unit tests for {@link XI} diff --git a/src/test/java/net/helix/hlx/benchmarks/BenchmarkRunner.java b/src/test/java/net/helix/pendulum/benchmarks/BenchmarkRunner.java similarity index 93% rename from src/test/java/net/helix/hlx/benchmarks/BenchmarkRunner.java rename to src/test/java/net/helix/pendulum/benchmarks/BenchmarkRunner.java index 7a5478b3..22c943c0 100644 --- a/src/test/java/net/helix/hlx/benchmarks/BenchmarkRunner.java +++ b/src/test/java/net/helix/pendulum/benchmarks/BenchmarkRunner.java @@ -1,6 +1,6 @@ -package net.helix.hlx.benchmarks; +package net.helix.pendulum.benchmarks; -import net.helix.hlx.benchmarks.dbbenchmark.RocksDbBenchmark; +import net.helix.pendulum.benchmarks.dbbenchmark.RocksDbBenchmark; import org.junit.Assert; import org.junit.Test; import org.openjdk.jmh.annotations.Mode; diff --git a/src/test/java/net/helix/hlx/benchmarks/crypto/GreedyMinerBenchmark.java b/src/test/java/net/helix/pendulum/benchmarks/crypto/GreedyMinerBenchmark.java similarity index 95% rename from src/test/java/net/helix/hlx/benchmarks/crypto/GreedyMinerBenchmark.java rename to src/test/java/net/helix/pendulum/benchmarks/crypto/GreedyMinerBenchmark.java index 13f691d9..78573a83 100644 --- a/src/test/java/net/helix/hlx/benchmarks/crypto/GreedyMinerBenchmark.java +++ b/src/test/java/net/helix/pendulum/benchmarks/crypto/GreedyMinerBenchmark.java @@ -1,6 +1,6 @@ -package net.helix.hlx.benchmarks.crypto; +package net.helix.pendulum.benchmarks.crypto; -import net.helix.hlx.crypto.GreedyMiner; +import net.helix.pendulum.crypto.GreedyMiner; import org.bouncycastle.util.encoders.Hex; import org.openjdk.jmh.annotations.Benchmark; diff --git a/src/test/java/net/helix/hlx/benchmarks/crypto/Sha3Benchmark.java b/src/test/java/net/helix/pendulum/benchmarks/crypto/Sha3Benchmark.java similarity index 94% rename from src/test/java/net/helix/hlx/benchmarks/crypto/Sha3Benchmark.java rename to src/test/java/net/helix/pendulum/benchmarks/crypto/Sha3Benchmark.java index 768dc85b..67e3aa09 100644 --- a/src/test/java/net/helix/hlx/benchmarks/crypto/Sha3Benchmark.java +++ b/src/test/java/net/helix/pendulum/benchmarks/crypto/Sha3Benchmark.java @@ -1,7 +1,7 @@ -package net.helix.hlx.benchmarks.crypto; +package net.helix.pendulum.benchmarks.crypto; -import net.helix.hlx.crypto.Sha3; -import net.helix.hlx.crypto.SpongeFactory; +import net.helix.pendulum.crypto.Sha3; +import net.helix.pendulum.crypto.SpongeFactory; import org.bouncycastle.util.encoders.Hex; import org.junit.Assert; import org.openjdk.jmh.annotations.Benchmark; diff --git a/src/test/java/net/helix/hlx/conf/ConfigTest.java b/src/test/java/net/helix/pendulum/conf/ConfigTest.java similarity index 99% rename from src/test/java/net/helix/hlx/conf/ConfigTest.java rename to src/test/java/net/helix/pendulum/conf/ConfigTest.java index 9fc03d3f..ec0a89c0 100644 --- a/src/test/java/net/helix/hlx/conf/ConfigTest.java +++ b/src/test/java/net/helix/pendulum/conf/ConfigTest.java @@ -1,9 +1,9 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import net.helix.hlx.utils.HelixUtils; +import net.helix.pendulum.utils.HelixUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; diff --git a/src/test/java/net/helix/hlx/conf/ZMQConfigTest.java b/src/test/java/net/helix/pendulum/conf/ZMQConfigTest.java similarity index 98% rename from src/test/java/net/helix/hlx/conf/ZMQConfigTest.java rename to src/test/java/net/helix/pendulum/conf/ZMQConfigTest.java index 100982dd..354ef17f 100644 --- a/src/test/java/net/helix/hlx/conf/ZMQConfigTest.java +++ b/src/test/java/net/helix/pendulum/conf/ZMQConfigTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.conf; +package net.helix.pendulum.conf; import org.junit.Test; diff --git a/src/test/java/net/helix/hlx/controllers/BundleViewModelTest.java b/src/test/java/net/helix/pendulum/controllers/BundleViewModelTest.java similarity index 77% rename from src/test/java/net/helix/hlx/controllers/BundleViewModelTest.java rename to src/test/java/net/helix/pendulum/controllers/BundleViewModelTest.java index b1bddb91..52750db6 100644 --- a/src/test/java/net/helix/hlx/controllers/BundleViewModelTest.java +++ b/src/test/java/net/helix/pendulum/controllers/BundleViewModelTest.java @@ -1,19 +1,19 @@ -package net.helix.hlx.controllers; +package net.helix.pendulum.controllers; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.TransactionHash; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.storage.Tangle; -import static net.helix.hlx.TransactionTestUtils.getTransactionBytes; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.TransactionHash; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.storage.Tangle; +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytes; public class BundleViewModelTest { diff --git a/src/test/java/net/helix/hlx/controllers/TipsViewModelTest.java b/src/test/java/net/helix/pendulum/controllers/TipsViewModelTest.java similarity index 90% rename from src/test/java/net/helix/hlx/controllers/TipsViewModelTest.java rename to src/test/java/net/helix/pendulum/controllers/TipsViewModelTest.java index 650f0ae4..b983bb0f 100644 --- a/src/test/java/net/helix/hlx/controllers/TipsViewModelTest.java +++ b/src/test/java/net/helix/pendulum/controllers/TipsViewModelTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.controllers; +package net.helix.pendulum.controllers; import java.util.concurrent.ExecutionException; @@ -7,8 +7,8 @@ import org.junit.Test; import org.junit.Assert; -import net.helix.hlx.model.Hash; -import static net.helix.hlx.TransactionTestUtils.getTransactionHash; +import net.helix.pendulum.model.Hash; +import static net.helix.pendulum.TransactionTestUtils.getTransactionHash; public class TipsViewModelTest { diff --git a/src/test/java/net/helix/hlx/controllers/TransactionViewModelTest.java b/src/test/java/net/helix/pendulum/controllers/TransactionViewModelTest.java similarity index 96% rename from src/test/java/net/helix/hlx/controllers/TransactionViewModelTest.java rename to src/test/java/net/helix/pendulum/controllers/TransactionViewModelTest.java index 61b14dfc..12c437d1 100644 --- a/src/test/java/net/helix/hlx/controllers/TransactionViewModelTest.java +++ b/src/test/java/net/helix/pendulum/controllers/TransactionViewModelTest.java @@ -1,13 +1,13 @@ -package net.helix.hlx.controllers; - -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.TransactionHash; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; +package net.helix.pendulum.controllers; + +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.TransactionHash; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -21,7 +21,7 @@ import java.util.Random; import java.util.Set; -import static net.helix.hlx.TransactionTestUtils.*; +import static net.helix.pendulum.TransactionTestUtils.*; public class TransactionViewModelTest { diff --git a/src/test/java/net/helix/hlx/crypto/GreedyMinerTest.java b/src/test/java/net/helix/pendulum/crypto/GreedyMinerTest.java similarity index 94% rename from src/test/java/net/helix/hlx/crypto/GreedyMinerTest.java rename to src/test/java/net/helix/pendulum/crypto/GreedyMinerTest.java index a225b612..e45c0720 100644 --- a/src/test/java/net/helix/hlx/crypto/GreedyMinerTest.java +++ b/src/test/java/net/helix/pendulum/crypto/GreedyMinerTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; import java.util.Random; import org.bouncycastle.util.encoders.Hex; @@ -7,7 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.helix.hlx.controllers.TransactionViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; public class GreedyMinerTest { diff --git a/src/test/java/net/helix/hlx/crypto/K256Test.java b/src/test/java/net/helix/pendulum/crypto/K256Test.java similarity index 97% rename from src/test/java/net/helix/hlx/crypto/K256Test.java rename to src/test/java/net/helix/pendulum/crypto/K256Test.java index 252937b9..da45f129 100644 --- a/src/test/java/net/helix/hlx/crypto/K256Test.java +++ b/src/test/java/net/helix/pendulum/crypto/K256Test.java @@ -1,4 +1,4 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; import org.bouncycastle.jcajce.provider.digest.Keccak; import org.bouncycastle.util.encoders.Hex; diff --git a/src/test/java/net/helix/hlx/crypto/K512Test.java b/src/test/java/net/helix/pendulum/crypto/K512Test.java similarity index 98% rename from src/test/java/net/helix/hlx/crypto/K512Test.java rename to src/test/java/net/helix/pendulum/crypto/K512Test.java index d9fcb713..8972f9c5 100644 --- a/src/test/java/net/helix/hlx/crypto/K512Test.java +++ b/src/test/java/net/helix/pendulum/crypto/K512Test.java @@ -1,4 +1,4 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; import org.bouncycastle.jcajce.provider.digest.Keccak; import org.bouncycastle.util.encoders.Hex; diff --git a/src/test/java/net/helix/hlx/crypto/KeccakTest.java b/src/test/java/net/helix/pendulum/crypto/KeccakTest.java similarity index 99% rename from src/test/java/net/helix/hlx/crypto/KeccakTest.java rename to src/test/java/net/helix/pendulum/crypto/KeccakTest.java index ab5657c6..547d402f 100644 --- a/src/test/java/net/helix/hlx/crypto/KeccakTest.java +++ b/src/test/java/net/helix/pendulum/crypto/KeccakTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; import org.bouncycastle.jcajce.provider.digest.Keccak; import org.bouncycastle.jcajce.provider.digest.SHA3; diff --git a/src/test/java/net/helix/hlx/crypto/MinerTest.java b/src/test/java/net/helix/pendulum/crypto/MinerTest.java similarity index 93% rename from src/test/java/net/helix/hlx/crypto/MinerTest.java rename to src/test/java/net/helix/pendulum/crypto/MinerTest.java index 4f083e1e..eb1d1efb 100644 --- a/src/test/java/net/helix/hlx/crypto/MinerTest.java +++ b/src/test/java/net/helix/pendulum/crypto/MinerTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; import java.util.Arrays; import java.util.Random; @@ -8,7 +8,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.helix.hlx.controllers.TransactionViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; public class MinerTest { diff --git a/src/test/java/net/helix/hlx/crypto/Sha3Test.java b/src/test/java/net/helix/pendulum/crypto/Sha3Test.java similarity index 97% rename from src/test/java/net/helix/hlx/crypto/Sha3Test.java rename to src/test/java/net/helix/pendulum/crypto/Sha3Test.java index 12cda9d7..9dda3df2 100644 --- a/src/test/java/net/helix/hlx/crypto/Sha3Test.java +++ b/src/test/java/net/helix/pendulum/crypto/Sha3Test.java @@ -1,4 +1,4 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; import org.bouncycastle.jcajce.provider.digest.SHA3; import org.bouncycastle.util.encoders.Hex; diff --git a/src/test/java/net/helix/hlx/crypto/Sha3_512Test.java b/src/test/java/net/helix/pendulum/crypto/Sha3_512Test.java similarity index 98% rename from src/test/java/net/helix/hlx/crypto/Sha3_512Test.java rename to src/test/java/net/helix/pendulum/crypto/Sha3_512Test.java index 6da799eb..e9192196 100644 --- a/src/test/java/net/helix/hlx/crypto/Sha3_512Test.java +++ b/src/test/java/net/helix/pendulum/crypto/Sha3_512Test.java @@ -1,4 +1,4 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; import org.bouncycastle.jcajce.provider.digest.SHA3; import org.bouncycastle.util.encoders.Hex; diff --git a/src/test/java/net/helix/hlx/crypto/WinternitzTest.java b/src/test/java/net/helix/pendulum/crypto/WinternitzTest.java similarity index 92% rename from src/test/java/net/helix/hlx/crypto/WinternitzTest.java rename to src/test/java/net/helix/pendulum/crypto/WinternitzTest.java index aa292c33..95c378db 100644 --- a/src/test/java/net/helix/hlx/crypto/WinternitzTest.java +++ b/src/test/java/net/helix/pendulum/crypto/WinternitzTest.java @@ -1,8 +1,8 @@ -package net.helix.hlx.crypto; +package net.helix.pendulum.crypto; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; import org.junit.Assert; import org.junit.Test; diff --git a/src/test/java/net/helix/hlx/model/HashTest.java b/src/test/java/net/helix/pendulum/model/HashTest.java similarity index 95% rename from src/test/java/net/helix/hlx/model/HashTest.java rename to src/test/java/net/helix/pendulum/model/HashTest.java index 800b2bbc..6747af97 100644 --- a/src/test/java/net/helix/hlx/model/HashTest.java +++ b/src/test/java/net/helix/pendulum/model/HashTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.model; +package net.helix.pendulum.model; import java.util.Arrays; @@ -6,9 +6,9 @@ import org.junit.Assert; import org.junit.Test; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.SpongeFactory; -import static net.helix.hlx.TransactionTestUtils.getTransactionBytes; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.SpongeFactory; +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytes; public class HashTest { diff --git a/src/test/java/net/helix/hlx/model/persistables/HashesTest.java b/src/test/java/net/helix/pendulum/model/persistables/HashesTest.java similarity index 84% rename from src/test/java/net/helix/hlx/model/persistables/HashesTest.java rename to src/test/java/net/helix/pendulum/model/persistables/HashesTest.java index 30f26219..777d4bb4 100644 --- a/src/test/java/net/helix/hlx/model/persistables/HashesTest.java +++ b/src/test/java/net/helix/pendulum/model/persistables/HashesTest.java @@ -1,8 +1,8 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; import java.nio.ByteBuffer; -import net.helix.hlx.TransactionTestUtils; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.TransactionTestUtils; +import net.helix.pendulum.model.Hash; import org.junit.Assert; import org.junit.Test; import static org.hamcrest.Matchers.hasItem; diff --git a/src/test/java/net/helix/hlx/model/persistables/RoundTest.java b/src/test/java/net/helix/pendulum/model/persistables/RoundTest.java similarity index 86% rename from src/test/java/net/helix/hlx/model/persistables/RoundTest.java rename to src/test/java/net/helix/pendulum/model/persistables/RoundTest.java index 4437090d..e9ecf613 100644 --- a/src/test/java/net/helix/hlx/model/persistables/RoundTest.java +++ b/src/test/java/net/helix/pendulum/model/persistables/RoundTest.java @@ -1,8 +1,8 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; import java.nio.ByteBuffer; -import net.helix.hlx.TransactionTestUtils; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.TransactionTestUtils; +import net.helix.pendulum.model.Hash; import org.junit.Assert; import org.junit.Test; import static org.hamcrest.Matchers.hasItem; diff --git a/src/test/java/net/helix/hlx/model/persistables/TransactionTest.java b/src/test/java/net/helix/pendulum/model/persistables/TransactionTest.java similarity index 85% rename from src/test/java/net/helix/hlx/model/persistables/TransactionTest.java rename to src/test/java/net/helix/pendulum/model/persistables/TransactionTest.java index c4b660a2..2b49a517 100644 --- a/src/test/java/net/helix/hlx/model/persistables/TransactionTest.java +++ b/src/test/java/net/helix/pendulum/model/persistables/TransactionTest.java @@ -1,12 +1,12 @@ -package net.helix.hlx.model.persistables; +package net.helix.pendulum.model.persistables; import org.junit.Test; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -import net.helix.hlx.TransactionTestUtils; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.TransactionTestUtils; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; public class TransactionTest { diff --git a/src/test/java/net/helix/hlx/network/NodeTest.java b/src/test/java/net/helix/pendulum/network/NodeTest.java similarity index 89% rename from src/test/java/net/helix/hlx/network/NodeTest.java rename to src/test/java/net/helix/pendulum/network/NodeTest.java index ce04ddce..51cfe11b 100644 --- a/src/test/java/net/helix/hlx/network/NodeTest.java +++ b/src/test/java/net/helix/pendulum/network/NodeTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.network; +package net.helix.pendulum.network; import org.slf4j.LoggerFactory; import ch.qos.logback.classic.Level; @@ -26,12 +26,12 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; -import net.helix.hlx.model.Hash; -import net.helix.hlx.conf.NodeConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.TransactionValidator; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.conf.NodeConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.TransactionValidator; public class NodeTest { diff --git a/src/test/java/net/helix/hlx/network/TransactionRequesterTest.java b/src/test/java/net/helix/pendulum/network/TransactionRequesterTest.java similarity index 90% rename from src/test/java/net/helix/hlx/network/TransactionRequesterTest.java rename to src/test/java/net/helix/pendulum/network/TransactionRequesterTest.java index de771eba..c02ee794 100644 --- a/src/test/java/net/helix/hlx/network/TransactionRequesterTest.java +++ b/src/test/java/net/helix/pendulum/network/TransactionRequesterTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.network; +package net.helix.pendulum.network; import java.util.ArrayList; import java.util.Arrays; @@ -9,12 +9,12 @@ import org.junit.Test; import org.junit.Assert; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.storage.Tangle; -import static net.helix.hlx.TransactionTestUtils.getTransactionHash; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.storage.Tangle; +import static net.helix.pendulum.TransactionTestUtils.getTransactionHash; public class TransactionRequesterTest { diff --git a/src/test/java/net/helix/hlx/network/UDPNeighborTest.java b/src/test/java/net/helix/pendulum/network/UDPNeighborTest.java similarity index 97% rename from src/test/java/net/helix/hlx/network/UDPNeighborTest.java rename to src/test/java/net/helix/pendulum/network/UDPNeighborTest.java index 017a2479..0f2c2814 100644 --- a/src/test/java/net/helix/hlx/network/UDPNeighborTest.java +++ b/src/test/java/net/helix/pendulum/network/UDPNeighborTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.network; +package net.helix.pendulum.network; import org.junit.Test; import java.net.InetSocketAddress; diff --git a/src/test/java/net/helix/hlx/service/APICallTest.java b/src/test/java/net/helix/pendulum/service/APICallTest.java similarity index 83% rename from src/test/java/net/helix/hlx/service/APICallTest.java rename to src/test/java/net/helix/pendulum/service/APICallTest.java index 99be74ba..b2d38442 100644 --- a/src/test/java/net/helix/hlx/service/APICallTest.java +++ b/src/test/java/net/helix/pendulum/service/APICallTest.java @@ -1,11 +1,11 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import net.helix.hlx.conf.HelixConfig; +import net.helix.pendulum.conf.HelixConfig; public class APICallTest { diff --git a/src/test/java/net/helix/hlx/service/APIIntegrationTest.java b/src/test/java/net/helix/pendulum/service/APIIntegrationTest.java similarity index 93% rename from src/test/java/net/helix/hlx/service/APIIntegrationTest.java rename to src/test/java/net/helix/pendulum/service/APIIntegrationTest.java index ae262d16..a04c58ae 100644 --- a/src/test/java/net/helix/hlx/service/APIIntegrationTest.java +++ b/src/test/java/net/helix/pendulum/service/APIIntegrationTest.java @@ -1,16 +1,16 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import net.helix.hlx.XI; -import net.helix.hlx.Helix; -import net.helix.hlx.conf.ConfigFactory; -import net.helix.hlx.conf.XIConfig; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.TransactionHash; -import net.helix.hlx.service.restserver.resteasy.RestEasy; +import net.helix.pendulum.XI; +import net.helix.pendulum.Pendulum; +import net.helix.pendulum.conf.ConfigFactory; +import net.helix.pendulum.conf.XIConfig; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.TransactionHash; +import net.helix.pendulum.service.restserver.resteasy.RestEasy; import com.jayway.restassured.RestAssured; import com.jayway.restassured.builder.ResponseSpecBuilder; import com.jayway.restassured.config.HttpClientConfig; @@ -70,7 +70,7 @@ public class APIIntegrationTest { private static final TemporaryFolder dbFolder = new TemporaryFolder(); private static final TemporaryFolder logFolder = new TemporaryFolder(); - private static Helix helix; + private static Pendulum pendulum; private static API api; private static XI Xi; private static HelixConfig configuration; @@ -91,15 +91,15 @@ public static void setUp() throws Exception { configuration.parseConfigFromArgs(args); //create node - helix = new Helix(configuration); - Xi = new XI(helix); - ApiArgs apiArgs = new ApiArgs(helix, Xi); + pendulum = new Pendulum(configuration); + Xi = new XI(pendulum); + ApiArgs apiArgs = new ApiArgs(pendulum, Xi); api = new API(apiArgs); //init try { - helix.init(); - helix.snapshotProvider.getInitialSnapshot().setTimestamp(0); + pendulum.init(); + pendulum.snapshotProvider.getInitialSnapshot().setTimestamp(0); api.init(new RestEasy(configuration)); Xi.init(XIConfig.XI_DIR); } catch (final Exception e) { @@ -116,7 +116,7 @@ public static void shutdown() { try { Xi.shutdown(); api.shutDown(); - helix.shutdown(); + pendulum.shutdown(); } catch (final Exception e) { log.error("Exception occurred shutting down Helix node: ", e); fail("Exception occurred shutting down Helix node"); diff --git a/src/test/java/net/helix/hlx/service/APITest.java b/src/test/java/net/helix/pendulum/service/APITest.java similarity index 93% rename from src/test/java/net/helix/hlx/service/APITest.java rename to src/test/java/net/helix/pendulum/service/APITest.java index 11d89fe0..4471abbe 100644 --- a/src/test/java/net/helix/hlx/service/APITest.java +++ b/src/test/java/net/helix/pendulum/service/APITest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service; +package net.helix.pendulum.service; import java.util.Collections; @@ -17,10 +17,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import net.helix.hlx.TransactionValidator; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.service.snapshot.SnapshotProvider; +import net.helix.pendulum.TransactionValidator; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.service.snapshot.SnapshotProvider; public class APITest { diff --git a/src/test/java/net/helix/hlx/service/MilestoneTest.java b/src/test/java/net/helix/pendulum/service/MilestoneTest.java similarity index 100% rename from src/test/java/net/helix/hlx/service/MilestoneTest.java rename to src/test/java/net/helix/pendulum/service/MilestoneTest.java diff --git a/src/test/java/net/helix/hlx/service/restserver/RestEasyTest.java b/src/test/java/net/helix/pendulum/service/restserver/RestEasyTest.java similarity index 91% rename from src/test/java/net/helix/hlx/service/restserver/RestEasyTest.java rename to src/test/java/net/helix/pendulum/service/restserver/RestEasyTest.java index 0c6b1d56..b2198bb5 100644 --- a/src/test/java/net/helix/hlx/service/restserver/RestEasyTest.java +++ b/src/test/java/net/helix/pendulum/service/restserver/RestEasyTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.restserver; +package net.helix.pendulum.service.restserver; import java.net.InetAddress; @@ -20,10 +20,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import net.helix.hlx.conf.APIConfig; -import net.helix.hlx.service.dto.ErrorResponse; -import net.helix.hlx.service.dto.GetNodeInfoResponse; -import net.helix.hlx.service.restserver.resteasy.RestEasy; +import net.helix.pendulum.conf.APIConfig; +import net.helix.pendulum.service.dto.ErrorResponse; +import net.helix.pendulum.service.dto.GetNodeInfoResponse; +import net.helix.pendulum.service.restserver.resteasy.RestEasy; public class RestEasyTest { diff --git a/src/test/java/net/helix/hlx/service/snapshot/impl/LocalSnapshotManagerImplTest.java b/src/test/java/net/helix/pendulum/service/snapshot/impl/LocalSnapshotManagerImplTest.java similarity index 89% rename from src/test/java/net/helix/hlx/service/snapshot/impl/LocalSnapshotManagerImplTest.java rename to src/test/java/net/helix/pendulum/service/snapshot/impl/LocalSnapshotManagerImplTest.java index 81e07b0c..17281ffe 100644 --- a/src/test/java/net/helix/hlx/service/snapshot/impl/LocalSnapshotManagerImplTest.java +++ b/src/test/java/net/helix/pendulum/service/snapshot/impl/LocalSnapshotManagerImplTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; import org.junit.After; import org.junit.Before; @@ -16,13 +16,13 @@ import static org.mockito.Mockito.when; import static org.mockito.Mockito.any; -import net.helix.hlx.conf.SnapshotConfig; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.snapshot.SnapshotException; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.SnapshotService; -import net.helix.hlx.service.transactionpruning.TransactionPruner; -import net.helix.hlx.utils.thread.ThreadUtils; +import net.helix.pendulum.conf.SnapshotConfig; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.snapshot.SnapshotException; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.SnapshotService; +import net.helix.pendulum.service.transactionpruning.TransactionPruner; +import net.helix.pendulum.utils.thread.ThreadUtils; public class LocalSnapshotManagerImplTest { diff --git a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotImplTest.java b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotImplTest.java similarity index 86% rename from src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotImplTest.java rename to src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotImplTest.java index 45845f26..105c1b9b 100644 --- a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotImplTest.java +++ b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotImplTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; import java.util.HashMap; @@ -6,11 +6,11 @@ import org.junit.Test; import static org.junit.Assert.*; -import net.helix.hlx.TransactionTestUtils; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.Snapshot; -import net.helix.hlx.service.snapshot.SnapshotMetaData; -import net.helix.hlx.service.snapshot.SnapshotState; +import net.helix.pendulum.TransactionTestUtils; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.Snapshot; +import net.helix.pendulum.service.snapshot.SnapshotMetaData; +import net.helix.pendulum.service.snapshot.SnapshotState; public class SnapshotImplTest { diff --git a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotMetaDataImplTest.java b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotMetaDataImplTest.java similarity index 94% rename from src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotMetaDataImplTest.java rename to src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotMetaDataImplTest.java index ad1e491e..3742c27b 100644 --- a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotMetaDataImplTest.java +++ b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotMetaDataImplTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; import java.util.Collections; import java.util.HashMap; @@ -8,10 +8,10 @@ import org.junit.Test; import static org.junit.Assert.*; -import net.helix.hlx.TransactionTestUtils; -import net.helix.hlx.conf.BaseHelixConfig; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.SnapshotMetaData; +import net.helix.pendulum.TransactionTestUtils; +import net.helix.pendulum.conf.BaseHelixConfig; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.SnapshotMetaData; public class SnapshotMetaDataImplTest { diff --git a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotMockUtils.java b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotMockUtils.java similarity index 93% rename from src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotMockUtils.java rename to src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotMockUtils.java index 03f948d0..ce266766 100644 --- a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotMockUtils.java +++ b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotMockUtils.java @@ -1,13 +1,13 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; import java.util.HashMap; import java.util.Map; import org.mockito.Mockito; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.Snapshot; -import net.helix.hlx.service.snapshot.SnapshotProvider; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.Snapshot; +import net.helix.pendulum.service.snapshot.SnapshotProvider; public class SnapshotMockUtils { diff --git a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotProviderImplTest.java b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotProviderImplTest.java similarity index 85% rename from src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotProviderImplTest.java rename to src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotProviderImplTest.java index 82ba82fe..a3247f25 100644 --- a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotProviderImplTest.java +++ b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotProviderImplTest.java @@ -1,15 +1,15 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; import org.junit.After; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; -import net.helix.hlx.conf.ConfigFactory; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.SnapshotException; -import net.helix.hlx.service.spentaddresses.SpentAddressesException; +import net.helix.pendulum.conf.ConfigFactory; +import net.helix.pendulum.conf.HelixConfig; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.SnapshotException; +import net.helix.pendulum.service.spentaddresses.SpentAddressesException; public class SnapshotProviderImplTest { diff --git a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotServiceImplTest.java b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotServiceImplTest.java similarity index 91% rename from src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotServiceImplTest.java rename to src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotServiceImplTest.java index f85c9ff6..efd99496 100644 --- a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotServiceImplTest.java +++ b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotServiceImplTest.java @@ -1,33 +1,31 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; import java.util.HashMap; import java.util.Map; -import net.helix.hlx.conf.HelixConfig; -import net.helix.hlx.conf.MainnetConfig; +import net.helix.pendulum.conf.HelixConfig; import org.junit.Assert; import org.junit.Before; import org.junit.FixMethodOrder; import org.junit.Rule; -import org.junit.Test; import org.junit.runners.MethodSorters; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import net.helix.hlx.TangleMockUtils; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.service.snapshot.Snapshot; -import net.helix.hlx.service.snapshot.SnapshotException; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.storage.Tangle; -import static net.helix.hlx.TransactionTestUtils.getTransactionHash; -import static net.helix.hlx.TransactionTestUtils.getTransaction; +import net.helix.pendulum.TangleMockUtils; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.service.snapshot.Snapshot; +import net.helix.pendulum.service.snapshot.SnapshotException; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.storage.Tangle; +import static net.helix.pendulum.TransactionTestUtils.getTransactionHash; +import static net.helix.pendulum.TransactionTestUtils.getTransaction; @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotStateDiffImplTest.java b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateDiffImplTest.java similarity index 89% rename from src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotStateDiffImplTest.java rename to src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateDiffImplTest.java index 1866f5d1..5da2afb4 100644 --- a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotStateDiffImplTest.java +++ b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateDiffImplTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; import java.util.Collections; import java.util.HashMap; @@ -7,8 +7,8 @@ import org.junit.Test; import static org.junit.Assert.*; -import net.helix.hlx.TransactionTestUtils; -import net.helix.hlx.model.Hash; +import net.helix.pendulum.TransactionTestUtils; +import net.helix.pendulum.model.Hash; public class SnapshotStateDiffImplTest { diff --git a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotStateImplTest.java b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateImplTest.java similarity index 90% rename from src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotStateImplTest.java rename to src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateImplTest.java index bbaf8724..6333fe24 100644 --- a/src/test/java/net/helix/hlx/service/snapshot/impl/SnapshotStateImplTest.java +++ b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotStateImplTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.snapshot.impl; +package net.helix.pendulum.service.snapshot.impl; import java.util.HashMap; import java.util.Map; @@ -7,12 +7,12 @@ import org.junit.Test; import static org.junit.Assert.*; -import net.helix.hlx.TransactionTestUtils; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.SnapshotException; -import net.helix.hlx.service.snapshot.SnapshotState; -import net.helix.hlx.service.snapshot.SnapshotStateDiff; +import net.helix.pendulum.TransactionTestUtils; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.SnapshotException; +import net.helix.pendulum.service.snapshot.SnapshotState; +import net.helix.pendulum.service.snapshot.SnapshotStateDiff; public class SnapshotStateImplTest { diff --git a/src/test/java/net/helix/hlx/service/tipselection/impl/CumulativeWeightCalculatorTest.java b/src/test/java/net/helix/pendulum/service/tipselection/impl/CumulativeWeightCalculatorTest.java similarity index 94% rename from src/test/java/net/helix/hlx/service/tipselection/impl/CumulativeWeightCalculatorTest.java rename to src/test/java/net/helix/pendulum/service/tipselection/impl/CumulativeWeightCalculatorTest.java index 9cdb95f7..8990b4e1 100644 --- a/src/test/java/net/helix/hlx/service/tipselection/impl/CumulativeWeightCalculatorTest.java +++ b/src/test/java/net/helix/pendulum/service/tipselection/impl/CumulativeWeightCalculatorTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.tipselection.impl; +package net.helix.pendulum.service.tipselection.impl; import java.util.*; import org.junit.AfterClass; @@ -9,21 +9,21 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.controllers.ApproveeViewModel; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashFactory; -import net.helix.hlx.model.HashId; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; - -import static net.helix.hlx.TransactionTestUtils.getTransactionBytes; -import static net.helix.hlx.TransactionTestUtils.getTransactionHash; -import static net.helix.hlx.TransactionTestUtils.getTransactionBytesWithTrunkAndBranch; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.controllers.ApproveeViewModel; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashFactory; +import net.helix.pendulum.model.HashId; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; + +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytes; +import static net.helix.pendulum.TransactionTestUtils.getTransactionHash; +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytesWithTrunkAndBranch; public class CumulativeWeightCalculatorTest { diff --git a/src/test/java/net/helix/hlx/service/tipselection/impl/EntryPointSelectorImplTest.java b/src/test/java/net/helix/pendulum/service/tipselection/impl/EntryPointSelectorImplTest.java similarity index 78% rename from src/test/java/net/helix/hlx/service/tipselection/impl/EntryPointSelectorImplTest.java rename to src/test/java/net/helix/pendulum/service/tipselection/impl/EntryPointSelectorImplTest.java index fb018dce..59d33089 100644 --- a/src/test/java/net/helix/hlx/service/tipselection/impl/EntryPointSelectorImplTest.java +++ b/src/test/java/net/helix/pendulum/service/tipselection/impl/EntryPointSelectorImplTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.tipselection.impl; +package net.helix.pendulum.service.tipselection.impl; import org.junit.Assert; import org.junit.BeforeClass; @@ -11,17 +11,17 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import net.helix.hlx.TransactionTestUtils; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.controllers.RoundViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.IntegerIndex; -import net.helix.hlx.model.persistables.Round; -import net.helix.hlx.service.milestone.MilestoneTracker; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.service.tipselection.EntryPointSelector; -import net.helix.hlx.storage.Tangle; +import net.helix.pendulum.TransactionTestUtils; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.controllers.RoundViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.IntegerIndex; +import net.helix.pendulum.model.persistables.Round; +import net.helix.pendulum.service.milestone.MilestoneTracker; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.service.tipselection.EntryPointSelector; +import net.helix.pendulum.storage.Tangle; @FixMethodOrder(MethodSorters.NAME_ASCENDING) diff --git a/src/test/java/net/helix/hlx/service/tipselection/impl/RatingOneTest.java b/src/test/java/net/helix/pendulum/service/tipselection/impl/RatingOneTest.java similarity index 79% rename from src/test/java/net/helix/hlx/service/tipselection/impl/RatingOneTest.java rename to src/test/java/net/helix/pendulum/service/tipselection/impl/RatingOneTest.java index a613c68e..9435c6dd 100644 --- a/src/test/java/net/helix/hlx/service/tipselection/impl/RatingOneTest.java +++ b/src/test/java/net/helix/pendulum/service/tipselection/impl/RatingOneTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.tipselection.impl; +package net.helix.pendulum.service.tipselection.impl; import org.junit.AfterClass; import org.junit.Assert; @@ -6,18 +6,18 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.HashId; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.service.tipselection.RatingCalculator; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; -import static net.helix.hlx.TransactionTestUtils.getTransactionBytes; -import static net.helix.hlx.TransactionTestUtils.getTransactionHash; -import static net.helix.hlx.TransactionTestUtils.getTransactionBytesWithTrunkAndBranch; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.HashId; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.service.tipselection.RatingCalculator; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytes; +import static net.helix.pendulum.TransactionTestUtils.getTransactionHash; +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytesWithTrunkAndBranch; public class RatingOneTest { diff --git a/src/test/java/net/helix/hlx/service/tipselection/impl/TailFinderImplTest.java b/src/test/java/net/helix/pendulum/service/tipselection/impl/TailFinderImplTest.java similarity index 78% rename from src/test/java/net/helix/hlx/service/tipselection/impl/TailFinderImplTest.java rename to src/test/java/net/helix/pendulum/service/tipselection/impl/TailFinderImplTest.java index ffbeea06..5a2ba3be 100644 --- a/src/test/java/net/helix/hlx/service/tipselection/impl/TailFinderImplTest.java +++ b/src/test/java/net/helix/pendulum/service/tipselection/impl/TailFinderImplTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.tipselection.impl; +package net.helix.pendulum.service.tipselection.impl; import java.util.Optional; @@ -8,19 +8,19 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; -import static net.helix.hlx.TransactionTestUtils.getTransactionBytes; -import static net.helix.hlx.TransactionTestUtils.getTransactionHash; -import static net.helix.hlx.TransactionTestUtils.createBundleHead; -import static net.helix.hlx.TransactionTestUtils.createTransactionWithTrunkBundleHash; -import static net.helix.hlx.TransactionTestUtils.getTransactionBytesWithTrunkAndBranch; - -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytes; +import static net.helix.pendulum.TransactionTestUtils.getTransactionHash; +import static net.helix.pendulum.TransactionTestUtils.createBundleHead; +import static net.helix.pendulum.TransactionTestUtils.createTransactionWithTrunkBundleHash; +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytesWithTrunkAndBranch; + +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; public class TailFinderImplTest { diff --git a/src/test/java/net/helix/hlx/service/tipselection/impl/WalkValidatorImplTest.java b/src/test/java/net/helix/pendulum/service/tipselection/impl/WalkValidatorImplTest.java similarity index 93% rename from src/test/java/net/helix/hlx/service/tipselection/impl/WalkValidatorImplTest.java rename to src/test/java/net/helix/pendulum/service/tipselection/impl/WalkValidatorImplTest.java index 9a73603f..331e4f37 100644 --- a/src/test/java/net/helix/hlx/service/tipselection/impl/WalkValidatorImplTest.java +++ b/src/test/java/net/helix/pendulum/service/tipselection/impl/WalkValidatorImplTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.tipselection.impl; +package net.helix.pendulum.service.tipselection.impl; import java.util.HashMap; import java.util.HashSet; @@ -14,18 +14,18 @@ import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; -import net.helix.hlx.TransactionTestUtils; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.conf.TipSelConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.service.ledger.LedgerService; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; -import static net.helix.hlx.TransactionTestUtils.getTransactionBytesWithTrunkAndBranch; -import static net.helix.hlx.TransactionTestUtils.getTransactionHash; +import net.helix.pendulum.TransactionTestUtils; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.conf.TipSelConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.service.ledger.LedgerService; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytesWithTrunkAndBranch; +import static net.helix.pendulum.TransactionTestUtils.getTransactionHash; public class WalkValidatorImplTest { diff --git a/src/test/java/net/helix/hlx/service/tipselection/impl/WalkerAlphaTest.java b/src/test/java/net/helix/pendulum/service/tipselection/impl/WalkerAlphaTest.java similarity index 91% rename from src/test/java/net/helix/hlx/service/tipselection/impl/WalkerAlphaTest.java rename to src/test/java/net/helix/pendulum/service/tipselection/impl/WalkerAlphaTest.java index a99e09a1..4b4404f9 100644 --- a/src/test/java/net/helix/hlx/service/tipselection/impl/WalkerAlphaTest.java +++ b/src/test/java/net/helix/pendulum/service/tipselection/impl/WalkerAlphaTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.service.tipselection.impl; +package net.helix.pendulum.service.tipselection.impl; import java.util.HashMap; import java.util.Map; @@ -14,21 +14,21 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.model.Hash; -import net.helix.hlx.model.HashId; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; -import net.helix.hlx.service.tipselection.RatingCalculator; -import net.helix.hlx.service.tipselection.TailFinder; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; -import net.helix.hlx.utils.collections.interfaces.UnIterableMap; - -import static net.helix.hlx.TransactionTestUtils.getTransactionBytes; -import static net.helix.hlx.TransactionTestUtils.getTransactionHash; -import static net.helix.hlx.TransactionTestUtils.getTransactionBytesWithTrunkAndBranch; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.Hash; +import net.helix.pendulum.model.HashId; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.service.tipselection.RatingCalculator; +import net.helix.pendulum.service.tipselection.TailFinder; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; +import net.helix.pendulum.utils.collections.interfaces.UnIterableMap; + +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytes; +import static net.helix.pendulum.TransactionTestUtils.getTransactionHash; +import static net.helix.pendulum.TransactionTestUtils.getTransactionBytesWithTrunkAndBranch; public class WalkerAlphaTest { diff --git a/src/test/java/net/helix/hlx/storage/TangleTest.java b/src/test/java/net/helix/pendulum/storage/TangleTest.java similarity index 78% rename from src/test/java/net/helix/hlx/storage/TangleTest.java rename to src/test/java/net/helix/pendulum/storage/TangleTest.java index 4a5b0764..1eb4d40a 100644 --- a/src/test/java/net/helix/hlx/storage/TangleTest.java +++ b/src/test/java/net/helix/pendulum/storage/TangleTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.storage; +package net.helix.pendulum.storage; import java.util.Arrays; import java.util.Random; @@ -9,17 +9,15 @@ import org.junit.Test; import org.junit.Assert; import org.junit.rules.TemporaryFolder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import net.helix.hlx.conf.MainnetConfig; -import net.helix.hlx.crypto.SpongeFactory; -import net.helix.hlx.model.TransactionHash; -import net.helix.hlx.model.persistables.Tag; -import net.helix.hlx.controllers.TransactionViewModel; -import net.helix.hlx.storage.rocksdb.RocksDBPersistenceProvider; -import net.helix.hlx.service.snapshot.SnapshotProvider; -import net.helix.hlx.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.crypto.SpongeFactory; +import net.helix.pendulum.model.TransactionHash; +import net.helix.pendulum.model.persistables.Tag; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; public class TangleTest { diff --git a/src/test/java/net/helix/hlx/storage/rocksdb/RocksDBPersistenceProviderTest.java b/src/test/java/net/helix/pendulum/storage/rocksdb/RocksDBPersistenceProviderTest.java similarity index 89% rename from src/test/java/net/helix/hlx/storage/rocksdb/RocksDBPersistenceProviderTest.java rename to src/test/java/net/helix/pendulum/storage/rocksdb/RocksDBPersistenceProviderTest.java index 4fbce80e..af63c45e 100644 --- a/src/test/java/net/helix/hlx/storage/rocksdb/RocksDBPersistenceProviderTest.java +++ b/src/test/java/net/helix/pendulum/storage/rocksdb/RocksDBPersistenceProviderTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.storage.rocksdb; +package net.helix.pendulum.storage.rocksdb; import java.util.Arrays; import java.util.List; @@ -11,15 +11,13 @@ import org.junit.Test; import org.junit.Assert; import org.junit.rules.TemporaryFolder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import net.helix.hlx.storage.Tangle; -import net.helix.hlx.storage.Indexable; -import net.helix.hlx.storage.Persistable; -import net.helix.hlx.model.IntegerIndex; -import net.helix.hlx.model.persistables.Transaction; -import net.helix.hlx.utils.Pair; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.model.IntegerIndex; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.utils.Pair; public class RocksDBPersistenceProviderTest { diff --git a/src/test/java/net/helix/hlx/utils/MapIdentityManagerTest.java b/src/test/java/net/helix/pendulum/utils/MapIdentityManagerTest.java similarity index 96% rename from src/test/java/net/helix/hlx/utils/MapIdentityManagerTest.java rename to src/test/java/net/helix/pendulum/utils/MapIdentityManagerTest.java index abd1a3c8..5db5b2f9 100644 --- a/src/test/java/net/helix/hlx/utils/MapIdentityManagerTest.java +++ b/src/test/java/net/helix/pendulum/utils/MapIdentityManagerTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils; +package net.helix.pendulum.utils; import java.util.HashMap; import io.undertow.security.idm.Account; diff --git a/src/test/java/net/helix/hlx/utils/SerializerTest.java b/src/test/java/net/helix/pendulum/utils/SerializerTest.java similarity index 92% rename from src/test/java/net/helix/hlx/utils/SerializerTest.java rename to src/test/java/net/helix/pendulum/utils/SerializerTest.java index c80f40e5..0f0cdab7 100644 --- a/src/test/java/net/helix/hlx/utils/SerializerTest.java +++ b/src/test/java/net/helix/pendulum/utils/SerializerTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils; +package net.helix.pendulum.utils; import java.nio.ByteBuffer; diff --git a/src/test/java/net/helix/hlx/utils/collections/impl/BoundedHashSetTest.java b/src/test/java/net/helix/pendulum/utils/collections/impl/BoundedHashSetTest.java similarity index 93% rename from src/test/java/net/helix/hlx/utils/collections/impl/BoundedHashSetTest.java rename to src/test/java/net/helix/pendulum/utils/collections/impl/BoundedHashSetTest.java index 6fcc409d..a8376856 100644 --- a/src/test/java/net/helix/hlx/utils/collections/impl/BoundedHashSetTest.java +++ b/src/test/java/net/helix/pendulum/utils/collections/impl/BoundedHashSetTest.java @@ -1,4 +1,4 @@ -package net.helix.hlx.utils.collections.impl; +package net.helix.pendulum.utils.collections.impl; import java.util.Arrays; import java.util.HashSet; From 2e01006365f7d20fdbe3e660dcf9b371bbb16c0b Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:01:28 +0200 Subject: [PATCH 05/16] Refactor config --- src/main/java/net/helix/pendulum/Main.java | 6 +++--- ...elixConfig.java => BasePendulumConfig.java} | 2 +- .../net/helix/pendulum/conf/MainnetConfig.java | 2 +- .../pendulum/conf/SolidificationConfig.java | 2 +- .../net/helix/pendulum/conf/TestnetConfig.java | 2 +- .../async/AsyncTransactionPruner.java | 3 ++- .../impl/SnapshotMetaDataImplTest.java | 18 +++++++++--------- 7 files changed, 18 insertions(+), 17 deletions(-) rename src/main/java/net/helix/pendulum/conf/{BaseHelixConfig.java => BasePendulumConfig.java} (99%) diff --git a/src/main/java/net/helix/pendulum/Main.java b/src/main/java/net/helix/pendulum/Main.java index f0c6e332..7dc3a2a3 100644 --- a/src/main/java/net/helix/pendulum/Main.java +++ b/src/main/java/net/helix/pendulum/Main.java @@ -2,7 +2,7 @@ import com.beust.jcommander.JCommander; import com.beust.jcommander.ParameterException; -import net.helix.pendulum.conf.BaseHelixConfig; +import net.helix.pendulum.conf.BasePendulumConfig; import net.helix.pendulum.conf.Config; import net.helix.pendulum.conf.ConfigFactory; import net.helix.pendulum.conf.HelixConfig; @@ -52,7 +52,7 @@ public class Main { * Starts by configuring the logging settings, then proceeds to {@link MainLauncher#main(String[])} * The log level is set to INFO by default. * - * @param args Configuration arguments. See {@link BaseHelixConfig} for a list of all options. + * @param args Configuration arguments. See {@link BasePendulumConfig} for a list of all options. * @throws Exception If we fail to start the MainLauncher. */ @@ -111,7 +111,7 @@ private static class MainLauncher { * * If no exception is thrown, the node starts synchronizing with the network, and the API can be used. * - * @param args Configuration arguments. See {@link BaseHelixConfig} for a list of all options. + * @param args Configuration arguments. See {@link BasePendulumConfig} for a list of all options. * @throws Exception If any of the init() methods failed to initialize. */ public static void main(String [] args) throws Exception { diff --git a/src/main/java/net/helix/pendulum/conf/BaseHelixConfig.java b/src/main/java/net/helix/pendulum/conf/BasePendulumConfig.java similarity index 99% rename from src/main/java/net/helix/pendulum/conf/BaseHelixConfig.java rename to src/main/java/net/helix/pendulum/conf/BasePendulumConfig.java index 94834300..1c53d9d3 100644 --- a/src/main/java/net/helix/pendulum/conf/BaseHelixConfig.java +++ b/src/main/java/net/helix/pendulum/conf/BasePendulumConfig.java @@ -25,7 +25,7 @@ prefixed with `is`. */ -public abstract class BaseHelixConfig implements HelixConfig { +public abstract class BasePendulumConfig implements HelixConfig { protected static final String SPLIT_STRING_TO_LIST_REGEX = ",| "; private boolean help; diff --git a/src/main/java/net/helix/pendulum/conf/MainnetConfig.java b/src/main/java/net/helix/pendulum/conf/MainnetConfig.java index 74cc8081..206d4511 100644 --- a/src/main/java/net/helix/pendulum/conf/MainnetConfig.java +++ b/src/main/java/net/helix/pendulum/conf/MainnetConfig.java @@ -1,6 +1,6 @@ package net.helix.pendulum.conf; -public class MainnetConfig extends BaseHelixConfig { +public class MainnetConfig extends BasePendulumConfig { @Override public boolean isTestnet() { return false; diff --git a/src/main/java/net/helix/pendulum/conf/SolidificationConfig.java b/src/main/java/net/helix/pendulum/conf/SolidificationConfig.java index 7b851136..a1e16db9 100644 --- a/src/main/java/net/helix/pendulum/conf/SolidificationConfig.java +++ b/src/main/java/net/helix/pendulum/conf/SolidificationConfig.java @@ -8,7 +8,7 @@ public interface SolidificationConfig extends Config { /** - * Default Value: {@value BaseHelixConfig.Defaults#TIP_SOLIDIFIER_ENABLED} + * Default Value: {@value BasePendulumConfig.Defaults#TIP_SOLIDIFIER_ENABLED} * * @return {@value SolidificationConfig.Descriptions#TIP_SOLIDIFIER} */ diff --git a/src/main/java/net/helix/pendulum/conf/TestnetConfig.java b/src/main/java/net/helix/pendulum/conf/TestnetConfig.java index 65841de0..cf265379 100644 --- a/src/main/java/net/helix/pendulum/conf/TestnetConfig.java +++ b/src/main/java/net/helix/pendulum/conf/TestnetConfig.java @@ -6,7 +6,7 @@ import java.util.Objects; -public class TestnetConfig extends BaseHelixConfig { +public class TestnetConfig extends BasePendulumConfig { protected boolean dontValidateTestnetMilestoneSig = Defaults.DONT_VALIDATE_MILESTONE_SIG; protected String snapshotFile = Defaults.SNAPSHOT_FILE; diff --git a/src/main/java/net/helix/pendulum/service/transactionpruning/async/AsyncTransactionPruner.java b/src/main/java/net/helix/pendulum/service/transactionpruning/async/AsyncTransactionPruner.java index 50b61442..b1ae6b02 100644 --- a/src/main/java/net/helix/pendulum/service/transactionpruning/async/AsyncTransactionPruner.java +++ b/src/main/java/net/helix/pendulum/service/transactionpruning/async/AsyncTransactionPruner.java @@ -1,5 +1,6 @@ package net.helix.pendulum.service.transactionpruning.async; +import net.helix.pendulum.conf.BasePendulumConfig; import net.helix.pendulum.conf.SnapshotConfig; import net.helix.pendulum.controllers.TipsViewModel; import net.helix.pendulum.service.snapshot.SnapshotProvider; @@ -398,7 +399,7 @@ private JobQueue getJobQueue(Class jobClass) thr * This method returns a file handle to state file. * * It constructs the path of the file by appending the corresponding file extension to the - * {@link net.helix.pendulum.conf.BaseHelixConfig#localSnapshotsBasePath} config variable. If the path is relative, it + * {@link BasePendulumConfig#localSnapshotsBasePath} config variable. If the path is relative, it * places the file relative to the current working directory, which is usually the location of the iri.jar. * * @return File handle to the state file. diff --git a/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotMetaDataImplTest.java b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotMetaDataImplTest.java index 3742c27b..25586a9b 100644 --- a/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotMetaDataImplTest.java +++ b/src/test/java/net/helix/pendulum/service/snapshot/impl/SnapshotMetaDataImplTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.*; import net.helix.pendulum.TransactionTestUtils; -import net.helix.pendulum.conf.BaseHelixConfig; +import net.helix.pendulum.conf.BasePendulumConfig; import net.helix.pendulum.model.Hash; import net.helix.pendulum.service.snapshot.SnapshotMetaData; @@ -40,8 +40,8 @@ public class SnapshotMetaDataImplTest { @Before public void setUp() { meta = new SnapshotMetaDataImpl(A, - BaseHelixConfig.Defaults.MILESTONE_START_INDEX, - BaseHelixConfig.Defaults.GLOBAL_SNAPSHOT_TIME, + BasePendulumConfig.Defaults.MILESTONE_START_INDEX, + BasePendulumConfig.Defaults.GLOBAL_SNAPSHOT_TIME, solidEntryPoints, seenMilestones); } @@ -49,11 +49,11 @@ public void setUp() { @Test public void initialIndexTest(){ assertEquals("Initial index should be equal to the one provided", - meta.getInitialIndex(), BaseHelixConfig.Defaults.MILESTONE_START_INDEX); + meta.getInitialIndex(), BasePendulumConfig.Defaults.MILESTONE_START_INDEX); assertEquals("Current index should be equal to the initial index", - meta.getIndex(), BaseHelixConfig.Defaults.MILESTONE_START_INDEX); + meta.getIndex(), BasePendulumConfig.Defaults.MILESTONE_START_INDEX); - meta.setIndex(BaseHelixConfig.Defaults.MILESTONE_START_INDEX + 1); + meta.setIndex(BasePendulumConfig.Defaults.MILESTONE_START_INDEX + 1); assertNotEquals("Initial index should not be the same as current index after setting", meta.getInitialIndex(), meta.getIndex()); } @@ -61,11 +61,11 @@ public void initialIndexTest(){ @Test public void initialTimestampTest(){ assertEquals("Initial timestamp should be equal to the one provided", - meta.getInitialTimestamp(), BaseHelixConfig.Defaults.GLOBAL_SNAPSHOT_TIME); + meta.getInitialTimestamp(), BasePendulumConfig.Defaults.GLOBAL_SNAPSHOT_TIME); assertEquals("Current timestamp should be equal to the initial timestamp", - meta.getTimestamp(), BaseHelixConfig.Defaults.GLOBAL_SNAPSHOT_TIME); + meta.getTimestamp(), BasePendulumConfig.Defaults.GLOBAL_SNAPSHOT_TIME); - meta.setTimestamp(BaseHelixConfig.Defaults.GLOBAL_SNAPSHOT_TIME + 1); + meta.setTimestamp(BasePendulumConfig.Defaults.GLOBAL_SNAPSHOT_TIME + 1); assertNotEquals("Initial timestamp should not be the same as current timestamp after setting", meta.getInitialTimestamp(), meta.getTimestamp()); } From 284b169767bf5ce11d1911a1e89dbe1fbd530868 Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:12:53 +0200 Subject: [PATCH 06/16] Fix pom refactor --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 24cb6c98..1069542b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.helix + net.pendulum pendulum 0.6.3 @@ -12,9 +12,9 @@ Pendulum Protocol - https://github.com/helixnetwork/pendulum/ - scm:git:git://github.com/helixnetwork/pendulum.git - scm:git:git@github.com/helixnetwork/pendulum.git + https://github.com/pendulumnetwork/pendulum/ + scm:git:git://github.com/pendulumnetwork/pendulum.git + scm:git:git@github.com/pendulumnetwork/pendulum.git @@ -264,9 +264,9 @@ shade - helix-${project.version} + pendulum-${project.version} ${project.basedir}/target - + @@ -446,7 +446,7 @@ file perm - /usr/share/helix/lib + /usr/share/pendulum/lib loader loader @@ -455,8 +455,8 @@ link true - /usr/share/helix/hlx.jar - /usr/share/helix/lib/${project.build.finalName}.jar + /usr/share/pendulum/pendulum.jar + /usr/share/pendulum/lib/${project.build.finalName}.jar From 3c4a016cff6d9a94007255dc4c3d1d5ef195ce30 Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:16:41 +0200 Subject: [PATCH 07/16] refactor Dockerfile --- Dockerfile | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad1effb6..e4daffa6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM helixnetwork/base16.04:latest as builder LABEL maintainer="dt@hlx.ai" -WORKDIR /helix -COPY . /helix +WORKDIR /pendulum +COPY . /pendulum RUN mvn clean package FROM openjdk:jre-slim @@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ socat \ && rm -rf /var/lib/apt/lists/* -COPY --from=builder /helix/target/helix*.jar /helix/target/ +COPY --from=builder /pendulum/target/pendulum*.jar /pendulum/target/ COPY docker/entrypoint.sh / # Default environment variables configuration. See DOCKER.md for details. @@ -19,19 +19,19 @@ COPY docker/entrypoint.sh / # `JAVA_OPTIONS` Java related options # `JAVA_MIN_MEMORY` and `JAVA_MAX_MEMORY` Settings for -Xms and -Xmx respectively. # See https://docs.oracle.com/cd/E21764_01/web.1111/e13814/jvm_tuning.htm#PERFM161 -# `DOCKER_HLX_JAR_PATH` Path where the HLX jar file is located. -# `DOCKER_HLX_JAR_FILE` HLX jar file. -# `DOCKER_HLX_REMOTE_LIMIT_API` Sets the --remote-limit-api options. +# `DOCKER_PLM_JAR_PATH` Path where the PLM (pendulum) jar file is located. +# `DOCKER_PLM_JAR_FILE` pendulum jar file. +# `DOCKER_PLM_REMOTE_LIMIT_API` Sets the --remote-limit-api options. # (Deprecation warning, see https://github.com/iotaledger/iri/issues/1500) -# `DOCKER_HLX_MONITORING_API_PORT_ENABLE` When using a docker bridged network setting this to 1 will have +# `DOCKER_PLM_MONITORING_API_PORT_ENABLE` When using a docker bridged network setting this to 1 will have # socat exposing 8086 and pointing it on localhost. See /entrypoint.sh -# Do not enable this option when running HLX's container on host network. +# Do not enable this option when running the pendulum container on host network. # !!! DO NOT DOCKER EXPOSE (-p) 8086 as the remote api settings will # not be applied on that port !!! -# You also have to maintain $DOCKER_HLX_MONITORING_API_PORT_DESTINATION -# based on the actual API port exposed via HLX -# `DOCKER_HLX_MONITORING_API_PORT_DESTINATION` Set this to the actual HLX API port. This is used to map port 14266. -# `DOCKER_HLX_REMOTE` When using a docker bridged network set this to true. Using host network +# You also have to maintain $DOCKER_PLM_MONITORING_API_PORT_DESTINATION +# based on the actual API port exposed via PLM +# `DOCKER_PLM_MONITORING_API_PORT_DESTINATION` Set this to the actual PLM API port. This is used to map port 14266. +# `DOCKER_PLM_REMOTE` When using a docker bridged network set this to true. Using host network # you may choose to set it to false to make sure the API port listens on # localhost only. If you want to bind your API (--api-host) to a specific interface # you will have to set this option to false. @@ -40,14 +40,14 @@ COPY docker/entrypoint.sh / ENV JAVA_OPTIONS="-XX:+UnlockExperimentalVMOptions -XX:+DisableAttachMechanism -XX:InitiatingHeapOccupancyPercent=60 -XX:G1MaxNewSizePercent=75 -XX:MaxGCPauseMillis=10000 -XX:+UseG1GC" \ JAVA_MIN_MEMORY=2G \ JAVA_MAX_MEMORY=4G \ - DOCKER_HLX_JAR_PATH="/helix/target" \ - DOCKER_HLX_JAR_FILE="helix*.jar" \ - DOCKER_HLX_REMOTE_LIMIT_API="interruptAttachToTangle, attachToTangle, addNeighbors, removeNeighbors, getNeighbors" \ - DOCKER_HLX_MONITORING_API_PORT_ENABLE=0 \ - DOCKER_HLX_MONITORING_API_PORT_DESTINATION=8085 \ - DOCKER_HLX_REMOTE=true \ - DOCKER_HLX_LOGGING_LEVEL="info" \ + DOCKER_PLM_JAR_PATH="/pendulum/target" \ + DOCKER_PLM_JAR_FILE="pendulum*.jar" \ + DOCKER_PLM_REMOTE_LIMIT_API="interruptAttachToTangle, attachToTangle, addNeighbors, removeNeighbors, getNeighbors" \ + DOCKER_PLM_MONITORING_API_PORT_ENABLE=0 \ + DOCKER_PLM_MONITORING_API_PORT_DESTINATION=8085 \ + DOCKER_PLM_REMOTE=true \ + DOCKER_PLM_LOGGING_LEVEL="info" \ DOCKER_JAVA_NET_PREFER_IPV4_STACK=true -WORKDIR /helix/data +WORKDIR /pendulum/data ENTRYPOINT [ "/entrypoint.sh" ] \ No newline at end of file From 26e4fc1ccf50d10dc257daa7fc13da79dad753df Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:18:50 +0200 Subject: [PATCH 08/16] docker-ssl refactor --- docker/ssl/README.md | 6 +++--- docker/ssl/docker-compose.yml | 6 +++--- docker/ssl/nginx-image/nginx-secure.conf | 4 ++-- docker/ssl/start.sh | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/ssl/README.md b/docker/ssl/README.md index 4397ebcc..b06b9244 100644 --- a/docker/ssl/README.md +++ b/docker/ssl/README.md @@ -1,4 +1,4 @@ -# Helix with SSL for Docker +# Pendulum with SSL for Docker This folder contains the files necessary to set up an IRI Docker container with an SSL certificate, using `nginx` proxy-pass to direct remote requests to IRI. @@ -11,12 +11,12 @@ You'll need the following in order to get started: ## Getting Started 1. Clone this repository: ``` -git clone https://github.com/helixnetwork/helix-1.0.git +git clone https://github.com/helixnetwork/pendulum.git ``` 2. Navigate to this directory: ``` -cd helix-1.0/docker/ssl +cd pendulum/docker/ssl ``` 3. Run the setup script and follow the prompts: diff --git a/docker/ssl/docker-compose.yml b/docker/ssl/docker-compose.yml index 649d8785..d433b7de 100644 --- a/docker/ssl/docker-compose.yml +++ b/docker/ssl/docker-compose.yml @@ -2,7 +2,7 @@ nginx: build: nginx-image links: - letsencrypt - - helix-1.0 + - pendulum environment: - MY_DOMAIN_NAME=__DOMAIN__ ports: @@ -22,6 +22,6 @@ letsencrypt: - "443" environment: - TERM=xterm -helix-1.0: - image: helixnetwork/helix-1.0:latest +pendulum: + image: helixnetwork/node:latest command: -p 8085 \ No newline at end of file diff --git a/docker/ssl/nginx-image/nginx-secure.conf b/docker/ssl/nginx-image/nginx-secure.conf index 86d069e1..d8529266 100644 --- a/docker/ssl/nginx-image/nginx-secure.conf +++ b/docker/ssl/nginx-image/nginx-secure.conf @@ -16,7 +16,7 @@ http { proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass http://helix:8085; + proxy_pass http://pendulum:8085; } } @@ -48,7 +48,7 @@ http { proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_pass http://helix:8085; + proxy_pass http://pendulum:8085; } } } \ No newline at end of file diff --git a/docker/ssl/start.sh b/docker/ssl/start.sh index 87c58bd3..dfe54d5f 100644 --- a/docker/ssl/start.sh +++ b/docker/ssl/start.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -echo "Setting up Let's Encrypt SSL for Helix using nginx proxy_pass" +echo "Setting up Let's Encrypt SSL for Pendulum using nginx proxy_pass" while getopts 'e:d:t' flag; do case "${flag}" in From deebc7d7365a312bbc1fd80710e68400973fb070 Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:19:39 +0200 Subject: [PATCH 09/16] refactor utils --- src/main/java/net/helix/pendulum/Main.java | 4 ++-- .../net/helix/pendulum/conf/BasePendulumConfig.java | 12 ++++++------ .../service/restserver/resteasy/RestEasy.java | 4 ++-- .../storage/rocksdb/RocksDBPersistenceProvider.java | 8 ++++---- .../{HelixIOUtils.java => PendulumIOUtils.java} | 2 +- .../utils/{HelixUtils.java => PendulumUtils.java} | 2 +- src/main/java/net/helix/pendulum/zmq/MessageQ.java | 6 +++--- .../java/net/helix/pendulum/conf/ConfigTest.java | 4 ++-- 8 files changed, 21 insertions(+), 21 deletions(-) rename src/main/java/net/helix/pendulum/utils/{HelixIOUtils.java => PendulumIOUtils.java} (97%) rename src/main/java/net/helix/pendulum/utils/{HelixUtils.java => PendulumUtils.java} (98%) diff --git a/src/main/java/net/helix/pendulum/Main.java b/src/main/java/net/helix/pendulum/Main.java index 7dc3a2a3..04417c68 100644 --- a/src/main/java/net/helix/pendulum/Main.java +++ b/src/main/java/net/helix/pendulum/Main.java @@ -11,7 +11,7 @@ import net.helix.pendulum.service.Spammer; import net.helix.pendulum.service.milestone.impl.MilestonePublisher; import net.helix.pendulum.service.restserver.resteasy.RestEasy; -import net.helix.pendulum.utils.HelixIOUtils; +import net.helix.pendulum.utils.PendulumIOUtils; import org.apache.commons.lang3.ArrayUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,7 +65,7 @@ public static void main(String[] args) throws Exception { } private static void configureLogging() { - HelixIOUtils.saveLogs(); + PendulumIOUtils.saveLogs(); String config = System.getProperty("logback.configurationFile"); String level = System.getProperty("logging-level", "debug").toUpperCase(); switch (level) { diff --git a/src/main/java/net/helix/pendulum/conf/BasePendulumConfig.java b/src/main/java/net/helix/pendulum/conf/BasePendulumConfig.java index 1c53d9d3..ee59b5e5 100644 --- a/src/main/java/net/helix/pendulum/conf/BasePendulumConfig.java +++ b/src/main/java/net/helix/pendulum/conf/BasePendulumConfig.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.ArrayUtils; import net.helix.pendulum.Main; -import net.helix.pendulum.utils.HelixUtils; +import net.helix.pendulum.utils.PendulumUtils; import net.helix.pendulum.model.Hash; import java.net.InetAddress; @@ -205,7 +205,7 @@ public List getRemoteLimitApi() { @JsonProperty @Parameter(names = {"--remote-limit-api"}, description = APIConfig.Descriptions.REMOTE_LIMIT_API) protected void setRemoteLimitApi(String remoteLimitApi) { - this.remoteLimitApi = HelixUtils.splitStringToImmutableList(remoteLimitApi, SPLIT_STRING_TO_LIST_REGEX); + this.remoteLimitApi = PendulumUtils.splitStringToImmutableList(remoteLimitApi, SPLIT_STRING_TO_LIST_REGEX); } @Override @@ -216,7 +216,7 @@ public List getRemoteTrustedApiHosts() { @JsonProperty @Parameter(names = {"--remote-trusted-api-hosts"}, description = APIConfig.Descriptions.REMOTE_TRUSTED_API_HOSTS) public void setRemoteTrustedApiHosts(String remoteTrustedApiHosts) { - List addresses = HelixUtils.splitStringToImmutableList(remoteTrustedApiHosts, SPLIT_STRING_TO_LIST_REGEX); + List addresses = PendulumUtils.splitStringToImmutableList(remoteTrustedApiHosts, SPLIT_STRING_TO_LIST_REGEX); List inetAddresses = addresses.stream().map(host -> { try { return InetAddress.getByName(host.trim()); @@ -372,7 +372,7 @@ public List getNeighbors() { @JsonProperty @Parameter(names = {"-n", "--neighbors"}, description = NetworkConfig.Descriptions.NEIGHBORS) protected void setNeighbors(String neighbors) { - this.neighbors = HelixUtils.splitStringToImmutableList(neighbors, SPLIT_STRING_TO_LIST_REGEX); + this.neighbors = PendulumUtils.splitStringToImmutableList(neighbors, SPLIT_STRING_TO_LIST_REGEX); } @Override @@ -955,9 +955,9 @@ public interface Defaults { //API int API_PORT = 8085; String API_HOST = "localhost"; - List REMOTE_LIMIT_API = HelixUtils.createImmutableList(); // "addNeighbors", "getNeighbors", "removeNeighbors", "attachToTangle", "interruptAttachingToTangle" <- TODO: limit these in production! + List REMOTE_LIMIT_API = PendulumUtils.createImmutableList(); // "addNeighbors", "getNeighbors", "removeNeighbors", "attachToTangle", "interruptAttachingToTangle" <- TODO: limit these in production! InetAddress REMOTE_LIMIT_API_DEFAULT_HOST = InetAddress.getLoopbackAddress(); - List REMOTE_LIMIT_API_HOSTS = HelixUtils.createImmutableList(REMOTE_LIMIT_API_DEFAULT_HOST); + List REMOTE_LIMIT_API_HOSTS = PendulumUtils.createImmutableList(REMOTE_LIMIT_API_DEFAULT_HOST); int MAX_FIND_TRANSACTIONS = 100_000; int MAX_REQUESTS_LIST = 1_000; int MAX_GET_TRANSACTION_STRINGS = 10_000; diff --git a/src/main/java/net/helix/pendulum/service/restserver/resteasy/RestEasy.java b/src/main/java/net/helix/pendulum/service/restserver/resteasy/RestEasy.java index 14ca13b0..f3566ef7 100644 --- a/src/main/java/net/helix/pendulum/service/restserver/resteasy/RestEasy.java +++ b/src/main/java/net/helix/pendulum/service/restserver/resteasy/RestEasy.java @@ -19,7 +19,7 @@ import net.helix.pendulum.service.dto.ExceptionResponse; import net.helix.pendulum.service.restserver.ApiProcessor; import net.helix.pendulum.service.restserver.RestConnector; -import net.helix.pendulum.utils.HelixIOUtils; +import net.helix.pendulum.utils.PendulumIOUtils; import org.jboss.resteasy.plugins.server.undertow.UndertowJaxrsServer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -273,7 +273,7 @@ private void processRequest(final HttpServerExchange exchange) throws IOExceptio exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/json"); final long beginningTime = System.currentTimeMillis(); - final String body = HelixIOUtils.toString(cis, StandardCharsets.UTF_8); + final String body = PendulumIOUtils.toString(cis, StandardCharsets.UTF_8); AbstractResponse response; String rcvdToken = (exchange.getRequestHeaders().get("Authorization") == null) ? "" : RemoteAuth.getToken(exchange.getRequestHeaders().get("Authorization").get(0)); diff --git a/src/main/java/net/helix/pendulum/storage/rocksdb/RocksDBPersistenceProvider.java b/src/main/java/net/helix/pendulum/storage/rocksdb/RocksDBPersistenceProvider.java index c70e0620..cfea9dce 100644 --- a/src/main/java/net/helix/pendulum/storage/rocksdb/RocksDBPersistenceProvider.java +++ b/src/main/java/net/helix/pendulum/storage/rocksdb/RocksDBPersistenceProvider.java @@ -4,7 +4,7 @@ import net.helix.pendulum.storage.Indexable; import net.helix.pendulum.storage.Persistable; import net.helix.pendulum.storage.PersistenceProvider; -import net.helix.pendulum.utils.HelixIOUtils; +import net.helix.pendulum.utils.PendulumIOUtils; import net.helix.pendulum.utils.Pair; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; @@ -72,9 +72,9 @@ public boolean isAvailable() { @Override public void shutdown() { for (final ColumnFamilyHandle columnFamilyHandle : columnFamilyHandles) { - HelixIOUtils.closeQuietly(columnFamilyHandle); + PendulumIOUtils.closeQuietly(columnFamilyHandle); } - HelixIOUtils.closeQuietly(db, options, bloomFilter); + PendulumIOUtils.closeQuietly(db, options, bloomFilter); } @Override @@ -497,7 +497,7 @@ private void initDB(String path, String logPath, Map splitStringToImmutableList(String string, String regexSplit) { return Arrays.stream(string.split(regexSplit)) .filter(StringUtils::isNoneBlank) diff --git a/src/main/java/net/helix/pendulum/zmq/MessageQ.java b/src/main/java/net/helix/pendulum/zmq/MessageQ.java index ab3a4a94..e4a5400b 100644 --- a/src/main/java/net/helix/pendulum/zmq/MessageQ.java +++ b/src/main/java/net/helix/pendulum/zmq/MessageQ.java @@ -1,7 +1,7 @@ package net.helix.pendulum.zmq; import net.helix.pendulum.conf.ZMQConfig; -import net.helix.pendulum.utils.HelixIOUtils; +import net.helix.pendulum.utils.PendulumIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.zeromq.ZMQ; @@ -57,7 +57,7 @@ public void shutdown() { LOG.error("Publisher service shutdown failed.", e); } - HelixIOUtils.closeQuietly(publisher); - HelixIOUtils.closeQuietly(context); + PendulumIOUtils.closeQuietly(publisher); + PendulumIOUtils.closeQuietly(context); } } diff --git a/src/test/java/net/helix/pendulum/conf/ConfigTest.java b/src/test/java/net/helix/pendulum/conf/ConfigTest.java index ec0a89c0..bcf1774d 100644 --- a/src/test/java/net/helix/pendulum/conf/ConfigTest.java +++ b/src/test/java/net/helix/pendulum/conf/ConfigTest.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.PropertyNamingStrategy; -import net.helix.pendulum.utils.HelixUtils; +import net.helix.pendulum.utils.PendulumUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -264,7 +264,7 @@ public void testInvalidIni() throws IOException { //@Test public void backwardsIniCompatibilityTest() { - Collection configNames = HelixUtils.getAllSetters(TestnetConfig.class) + Collection configNames = PendulumUtils.getAllSetters(TestnetConfig.class) .stream() .map(this::deriveNameFromSetter) .collect(Collectors.toList()); From 4b6998c4d324f10bfe173a9fcc74fea6b18ce6b3 Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:23:39 +0200 Subject: [PATCH 10/16] rename --- src/main/java/net/helix/pendulum/Main.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/helix/pendulum/Main.java b/src/main/java/net/helix/pendulum/Main.java index 04417c68..b468b2fb 100644 --- a/src/main/java/net/helix/pendulum/Main.java +++ b/src/main/java/net/helix/pendulum/Main.java @@ -45,7 +45,7 @@ public class Main { public static final String MAINNET_NAME = "Pendulum"; public static final String TESTNET_NAME = "Pendulum Testnet"; - public static final String VERSION = "0.6.3"; + public static final String VERSION = "0.6.4"; /** * The entry point of Pendulum. @@ -129,9 +129,9 @@ public static void main(String [] args) throws Exception { api.init(new RestEasy(pendulum.configuration)); //TODO redundant parameter but we will touch this when we refactor XI XI.init(config.getXiDir()); - log.info("Helix Node initialised correctly."); + log.info("Pendulum Node initialised correctly."); } catch (Exception e) { - log.error("Exception during Helix node initialisation: ", e); + log.error("Exception during Pendulum node initialisation: ", e); throw e; } if (config.getNominee() != null || new File(config.getNomineeKeyfile()).isFile() ) { From 5834a6d55e7b07b48309c0f8dae76f69bf66d213 Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:23:59 +0200 Subject: [PATCH 11/16] pom fixes --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1069542b..1996a978 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.pendulum pendulum - 0.6.3 + 0.6.4 Pendulum Pendulum Protocol From c5ed91290ef3bb883327a5de7fc8b48520fe973f Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:24:06 +0200 Subject: [PATCH 12/16] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d98f2237..1e6c34c7 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ # Helix Pendulum is a quorum based [Tangle](https://github.com/iotaledger/iri/) implementation designed towards reliable timekeeping and messaging. -- **Latest release:** 0.6.3 pre-release +- **Latest release:** 0.6.4 pre-release - **License:** GPLv3 Special thanks to all of the [IOTA Contributors](https://github.com/iotaledger/iri/graphs/contributors)! From 69197c422660f8b3803f98209a529309f1ee159a Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:26:00 +0200 Subject: [PATCH 13/16] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1e6c34c7..f43035f8 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![license][4]][5] [![build][6]][7] [![grade][8]][9] [![coverage][10]][11] [![discord][14]][15] -# Helix +# Pendulum Pendulum is a quorum based [Tangle](https://github.com/iotaledger/iri/) implementation designed towards reliable timekeeping and messaging. - **Latest release:** 0.6.4 pre-release From f9aa84fba8974747b2e70995c48d5dae4f2b5088 Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:48:54 +0200 Subject: [PATCH 14/16] fix .gitignore - DbConfig class was ignored --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a25a3539..2e8ffb8d 100644 --- a/.gitignore +++ b/.gitignore @@ -32,7 +32,7 @@ effective.pom enforcer.pom # db -db* +db mainnet.log mainnetdb testnet.log From 35b037f9964e9add73f38dc958c6f4f0cb662f8b Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 20:49:24 +0200 Subject: [PATCH 15/16] Add DbConfig + tests --- .../net/helix/pendulum/conf/DbConfig.java | 44 ++++++++++ .../dbbenchmark/RocksDbBenchmark.java | 44 ++++++++++ .../dbbenchmark/states/DbState.java | 85 +++++++++++++++++++ .../dbbenchmark/states/EmptyState.java | 26 ++++++ .../dbbenchmark/states/FullState.java | 52 ++++++++++++ 5 files changed, 251 insertions(+) create mode 100644 src/main/java/net/helix/pendulum/conf/DbConfig.java create mode 100644 src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/RocksDbBenchmark.java create mode 100644 src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/DbState.java create mode 100644 src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/EmptyState.java create mode 100644 src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/FullState.java diff --git a/src/main/java/net/helix/pendulum/conf/DbConfig.java b/src/main/java/net/helix/pendulum/conf/DbConfig.java new file mode 100644 index 00000000..d01966e9 --- /dev/null +++ b/src/main/java/net/helix/pendulum/conf/DbConfig.java @@ -0,0 +1,44 @@ +package net.helix.pendulum.conf; + +public interface DbConfig extends Config { + /** + * @return Descriptions#DB_PATH + */ + String getDbPath(); + + /** + * @return {@value Descriptions#DB_LOG_PATH} + */ + String getDbLogPath(); + + /** + * @return {@value Descriptions#DB_CACHE_SIZE} + */ + int getDbCacheSize(); + + /** + * @return {@value Descriptions#MAIN_DB} + */ + String getMainDb(); + + /** + * @return {@value Descriptions#REVALIDATE} + */ + boolean isRevalidate(); + + /** + * @return {@value Descriptions#RESCAN_DB} + */ + boolean isRescanDb(); + + interface Descriptions { + + String DB_PATH = "The folder where the DB saves its data."; + String DB_LOG_PATH = "The folder where the DB logs info"; + String DB_CACHE_SIZE = "The size of the DB cache in KB"; + String MAIN_DB = "The DB engine used to store the transactions. Currently only RocksDB is supported."; + String REVALIDATE = "Reload from the db data about confirmed transaction (milestones), state of the ledger, " + + "and transaction metadata."; + String RESCAN_DB = "Rescan all transaction metadata (Approvees, Bundles, and Tags)"; + } +} diff --git a/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/RocksDbBenchmark.java b/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/RocksDbBenchmark.java new file mode 100644 index 00000000..a27aadb7 --- /dev/null +++ b/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/RocksDbBenchmark.java @@ -0,0 +1,44 @@ +package net.helix.pendulum.benchmarks.dbbenchmark; + +import net.helix.pendulum.benchmarks.dbbenchmark.states.EmptyState; +import net.helix.pendulum.benchmarks.dbbenchmark.states.FullState; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.utils.Pair; +import org.openjdk.jmh.annotations.Benchmark; + +public class RocksDbBenchmark { + @Benchmark + public void persistOneByOne(EmptyState state) throws Exception { + for (TransactionViewModel tvm: state.getTransactions()) { + tvm.store(state.getTangle(), state.getSnapshotProvider().getInitialSnapshot()); + } + } + + @Benchmark + public void deleteOneByOne(FullState state) throws Exception { + for (TransactionViewModel tvm : state.getTransactions()) { + tvm.delete(state.getTangle()); + } + } + + @Benchmark + public void dropAll(FullState state) throws Exception { + state.getTangle().clearColumn(Transaction.class); + state.getTangle().clearMetadata(Transaction.class); + } + + @Benchmark + public void deleteBatch(FullState state) throws Exception { + state.getTangle().deleteBatch(state.getPairs()); + } + + @Benchmark + public void fetchOneByOne(FullState state) throws Exception { + for (Pair> pair : state.getPairs()) { + state.getTangle().load(pair.hi, pair.low); + } + } +} diff --git a/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/DbState.java b/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/DbState.java new file mode 100644 index 00000000..a4dd8a02 --- /dev/null +++ b/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/DbState.java @@ -0,0 +1,85 @@ +package net.helix.pendulum.benchmarks.dbbenchmark.states; + +import net.helix.pendulum.TransactionTestUtils; +import net.helix.pendulum.conf.BasePendulumConfig; +import net.helix.pendulum.conf.MainnetConfig; +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.service.snapshot.SnapshotProvider; +import net.helix.pendulum.service.snapshot.impl.SnapshotProviderImpl; +import net.helix.pendulum.storage.PersistenceProvider; +import net.helix.pendulum.storage.Tangle; +import net.helix.pendulum.storage.rocksdb.RocksDBPersistenceProvider; +import org.apache.commons.io.FileUtils; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; + +import java.io.File; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +@State(Scope.Benchmark) +public abstract class DbState { + private final File dbFolder = new File("db-bench"); + private final File logFolder = new File("db-log-bench"); + + private Tangle tangle; + private SnapshotProvider snapshotProvider; + private List transactions; + + @Param({"10", "100", "500", "1000", "3000"}) + private int numTxsToTest; + + public void setUp() throws Exception { + System.out.println("-----------------------trial setup--------------------------------"); + boolean mkdirs = dbFolder.mkdirs(); + if (!mkdirs) { + throw new IllegalStateException("db didn't start with a clean slate. Please delete " + + dbFolder.getAbsolutePath()); + } + logFolder.mkdirs(); + PersistenceProvider dbProvider = new RocksDBPersistenceProvider( + dbFolder.getAbsolutePath(), logFolder.getAbsolutePath(), BasePendulumConfig.Defaults.DB_CACHE_SIZE, Tangle.COLUMN_FAMILIES, Tangle.METADATA_COLUMN_FAMILY); + dbProvider.init(); + tangle = new Tangle(); + snapshotProvider = new SnapshotProviderImpl().init(new MainnetConfig()); + tangle.addPersistenceProvider(dbProvider); + String hex = ""; + System.out.println("numTxsToTest = [" + numTxsToTest + "]"); + transactions = new ArrayList<>(numTxsToTest); + for (int i = 0; i < numTxsToTest; i++) { + hex = TransactionTestUtils.nextWord(hex, i); + TransactionViewModel tvm = TransactionTestUtils.createTransactionWithHex(hex); + transactions.add(tvm); + } + transactions = Collections.unmodifiableList(transactions); + } + + public void shutdown() throws Exception { + System.out.println("-----------------------trial shutdown--------------------------------"); + tangle.shutdown(); + snapshotProvider.shutdown(); + FileUtils.forceDelete(dbFolder); + FileUtils.forceDelete(logFolder); + } + + public void clearDb() throws Exception { + System.out.println("-----------------------iteration shutdown--------------------------------"); + tangle.clearColumn(Transaction.class); + tangle.clearMetadata(Transaction.class); + } + + public Tangle getTangle() { + return tangle; + } + + public SnapshotProvider getSnapshotProvider() { + return snapshotProvider; + } + + public List getTransactions() { + return transactions; + } +} diff --git a/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/EmptyState.java b/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/EmptyState.java new file mode 100644 index 00000000..dfdf1951 --- /dev/null +++ b/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/EmptyState.java @@ -0,0 +1,26 @@ +package net.helix.pendulum.benchmarks.dbbenchmark.states; + +import org.openjdk.jmh.annotations.*; + +@State(Scope.Benchmark) +public class EmptyState extends DbState { + + @Override + @Setup(Level.Trial) + public void setUp() throws Exception { + super.setUp(); + } + + @Override + @TearDown(Level.Trial) + public void shutdown() throws Exception { + super.shutdown(); + } + + @Override + @TearDown(Level.Iteration) + public void clearDb() throws Exception { + super.clearDb(); + } + +} \ No newline at end of file diff --git a/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/FullState.java b/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/FullState.java new file mode 100644 index 00000000..0502c923 --- /dev/null +++ b/src/test/java/net/helix/pendulum/benchmarks/dbbenchmark/states/FullState.java @@ -0,0 +1,52 @@ +package net.helix.pendulum.benchmarks.dbbenchmark.states; + +import net.helix.pendulum.controllers.TransactionViewModel; +import net.helix.pendulum.model.persistables.Transaction; +import net.helix.pendulum.storage.Indexable; +import net.helix.pendulum.storage.Persistable; +import net.helix.pendulum.utils.Pair; +import org.openjdk.jmh.annotations.*; + +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +@State(Scope.Benchmark) +public class FullState extends DbState { + + private List>> pairs; + + @Override + @Setup(Level.Trial) + public void setUp() throws Exception { + super.setUp(); + pairs = getTransactions().stream() + .map(tvm -> new Pair<>((Indexable) tvm.getHash(), Transaction.class)) + .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList)); + + } + + @Override + @TearDown(Level.Trial) + public void shutdown() throws Exception { + super.shutdown(); + } + + @Override + @TearDown(Level.Iteration) + public void clearDb() throws Exception { + super.clearDb(); + } + + @Setup(Level.Iteration) + public void populateDb() throws Exception { + System.out.println("-----------------------iteration setup--------------------------------"); + for (TransactionViewModel tvm : getTransactions()) { + tvm.store(getTangle(), getSnapshotProvider().getInitialSnapshot()); + } + } + + public List>> getPairs() { + return pairs; + } +} From 80e1ea29c6bf4e05a5b2c53ff4d86a6f69ecaea1 Mon Sep 17 00:00:00 2001 From: ofo42 Date: Fri, 20 Sep 2019 21:18:06 +0200 Subject: [PATCH 16/16] fix readme build badge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f43035f8..0fa3ece0 100644 --- a/README.md +++ b/README.md @@ -178,9 +178,9 @@ Currently the following topics are covered: [5]: LICENSE -[6]: https://travis-ci.com/HelixNetwork/helix-1.0.svg?token=iyim5S8NXU1bnHDx8VMr&branch=master +[6]: https://travis-ci.com/HelixNetwork/pendulum.svg?token=iyim5S8NXU1bnHDx8VMr&branch=master -[7]: https://travis-ci.com/HelixNetwork/helix-1.0 +[7]: https://travis-ci.com/HelixNetwork/pendulum [8]: https://api.codacy.com/project/badge/Grade/0756a1f4690c453e99da9e242695634d