Continued:

- added a lot namespaces to classes and configuration entries
- added "import" lines
- updated core framework

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/application/hub/classes/blocks/miner/class_HashBlock.php b/application/hub/classes/blocks/miner/class_HashBlock.php
index 315423a4df6b7be9b654caff47a049e7948c64e3..12948b67ea3a8eab9434ec6dde4b05251a49086a 100644 (file)
--- a/application/hub/classes/blocks/miner/class_HashBlock.php
+++ b/application/hub/classes/blocks/miner/class_HashBlock.php
@@ -1,4 +1,11 @@
 <?php
+// Own namespace
+namespace Org\Shipsimu\Hub\Block\Hash;
+
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Block\BaseBlock;
+use Org\Shipsimu\Hub\Miner\Minable;
+
 /**
  * A Hash block class
  *
@@ -44,7 +51,5 @@ class HashBlock extends BaseBlock implements Minable {
                // Return the prepared instance
                return $blockInstance;
        }
-}
 
-// [EOF]
-?>
+}

diff --git a/application/hub/classes/class_BaseHubSystem.php b/application/hub/classes/class_BaseHubSystem.php
index 098b0bb8a42bd454d7f9f31c565a1339026db1ba..40a576dd303c7724cb7c11376199293bf0552c78 100644 (file)
--- a/application/hub/classes/class_BaseHubSystem.php
+++ b/application/hub/classes/class_BaseHubSystem.php
@@ -12,6 +12,7 @@ use Org\Shipsimu\Hub\Information\ShareableInfo;
 use Org\Shipsimu\Hub\Listener\BaseListener;
 use Org\Shipsimu\Hub\Listener\Listenable;
 use Org\Shipsimu\Hub\Locator\Node\LocateableNode;
+use Org\Shipsimu\Hub\Miner\Minable;
 use Org\Shipsimu\Hub\Network\Delivery\Deliverable;
 use Org\Shipsimu\Hub\Network\Package\DeliverablePackage;
 use Org\Shipsimu\Hub\Network\Package\Delivery\Fragment\Fragmentable;
@@ -131,6 +132,11 @@ abstract class BaseHubSystem extends BaseFrameworkSystem implements HubInterface
         */
        private $packageInstance = NULL;
 
+       /**
+        * A Minable instance
+        */
+       private $minableInstance = NULL;
+
        /**
         * Name of used protocol
         */
@@ -501,4 +507,23 @@ abstract class BaseHubSystem extends BaseFrameworkSystem implements HubInterface
                return $this->packageInstance;
        }
 
+       /**
+        * Setter for Minable instance
+        *
+        * @param       $minableInstance        A Minable instance
+        * @return      void
+        */
+       protected final function setMinableInstance (Minable $minableInstance) {
+               $this->minableInstance = $minableInstance;
+       }
+
+       /**
+        * Getter for minable instance
+        *
+        * @return      $minableInstance        A Minable instance
+        */
+       protected final function getMinableInstance () {
+               return $this->minableInstance;
+       }
+
 }

diff --git a/application/hub/classes/filter/miner/class_MinerInitializationFilter.php b/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
index db684702b0e62187f5ce2c62cdf2ef4f4b9faf24..74f7d3b60fad12b80f75c579cb5b288c6c73f680 100644 (file)
--- a/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
+++ b/application/hub/classes/filter/miner/class_MinerInitializationFilter.php
@@ -80,12 +80,12 @@ class MinerInitializationFilter extends BaseMinerFilter implements Filterable {
                }
 
                // Now convert the miner-mode in a class name
-               $className = 'Hub' . self::convertToClassName($minerMode) . 'Miner';
+               $configEntry = sprintf('hub_%s_miner_mode_class', $minerMode);
 
                // And try to instance it
                try {
                        // Get an instance
-                       $minerInstance = ObjectFactory::createObjectByName($className);
+                       $minerInstance = ObjectFactory::createObjectByConfiguredName($configEntry);
 
                        // Get a registry
                        $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');

diff --git a/application/hub/classes/miner/chash/class_HubCoinMiner.php b/application/hub/classes/miner/chash/class_HubCoinMiner.php
index ab24c45ef760bfc30b2b2a95d9cd75bd823abbbd..cd4f7af0a242a15840f6f462feba474c99e591da 100644 (file)
--- a/application/hub/classes/miner/chash/class_HubCoinMiner.php
+++ b/application/hub/classes/miner/chash/class_HubCoinMiner.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Org\Shipsimu\Hub\Miner;
 
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Helper\Miner\MinerHelper;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;

diff --git a/application/hub/classes/miner/class_BaseHubMiner.php b/application/hub/classes/miner/class_BaseHubMiner.php
index d6b92bf530c8435b53aee2343f28f87c31fd3c98..32a8d2809254a1a1fa51fb0a342f441e4c2a10e3 100644 (file)
--- a/application/hub/classes/miner/class_BaseHubMiner.php
+++ b/application/hub/classes/miner/class_BaseHubMiner.php
@@ -3,7 +3,10 @@
 namespace Org\Shipsimu\Hub\Miner;
 
 // Import application-specific stuff
+use Org\Shipsimu\Hub\Factory\State\Miner\MinerStateFactory;
 use Org\Shipsimu\Hub\Generic\BaseHubSystem;
+use Org\Shipsimu\Hub\Helper\Miner\MinerHelper;
+use Org\Shipsimu\Hub\Producer\Block\BlockProducer;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Database\Updateable;

diff --git a/application/hub/classes/producer/class_BaseProducer.php b/application/hub/classes/producer/class_BaseProducer.php
index a37da827634a329fa06c20385da0d2ccece964ce..a12b537140f3e757717b01f4a48a02785fddaa0e 100644 (file)
--- a/application/hub/classes/producer/class_BaseProducer.php
+++ b/application/hub/classes/producer/class_BaseProducer.php
@@ -8,6 +8,7 @@ use Org\Shipsimu\Hub\Generic\BaseHubSystem;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Stacker\Stackable;
 
 /**
  * A general Producer class

diff --git a/application/hub/classes/producer/cruncher/class_BaseKeyProducer.php b/application/hub/classes/producer/cruncher/class_BaseKeyProducer.php
index 1dd01f4fdf5164ae2df6e90fe4cec6279a86d53b..0a6d7354b352ca013f80bf45e6e911ec90f0f15e 100644 (file)
--- a/application/hub/classes/producer/cruncher/class_BaseKeyProducer.php
+++ b/application/hub/classes/producer/cruncher/class_BaseKeyProducer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Shipsimu\Hub\Producer\Key;
+
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Producer\BaseProducer;
+
 /**
  * A general KeyProducer class
  *

diff --git a/application/hub/classes/producer/cruncher/class_BaseUnitProducer.php b/application/hub/classes/producer/cruncher/class_BaseUnitProducer.php
index f0a79883e2e95c036d44416c02318efdc25c6ac1..395649cdb29c108c402ca3f4408c161db63131af 100644 (file)
--- a/application/hub/classes/producer/cruncher/class_BaseUnitProducer.php
+++ b/application/hub/classes/producer/cruncher/class_BaseUnitProducer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Shipsimu\Hub\Producer\Unit;
+
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Producer\BaseProducer;
+
 /**
  * A general UnitProducer class
  *

diff --git a/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php b/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php
index df08aca638474a9ab44333986e4347c893b08868..44a008c71c39ce8f42006d5e32c0b2757c50bed9 100644 (file)
--- a/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php
+++ b/application/hub/classes/producer/cruncher/keys/class_CruncherKeyProducer.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Org\Shipsimu\Hub\Producer\Cruncher\Key;
 
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Producer\BaseProducer;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registerable;

diff --git a/application/hub/classes/producer/cruncher/work_units/class_CruncherTestUnitProducer.php b/application/hub/classes/producer/cruncher/work_units/class_CruncherTestUnitProducer.php
index 7a27cd9cf9b27511b4f0fbbddb4e34481f249f19..63a954567c80f1b4a4d2f876eb570ba8100c4c5a 100644 (file)
--- a/application/hub/classes/producer/cruncher/work_units/class_CruncherTestUnitProducer.php
+++ b/application/hub/classes/producer/cruncher/work_units/class_CruncherTestUnitProducer.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Org\Shipsimu\Hub\Cruncher\Producer\Unit;
 
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Producer\BaseProducer;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;

diff --git a/application/hub/classes/producer/miner/blocks/class_MinerRealGenesisBlockProducer.php b/application/hub/classes/producer/miner/blocks/class_MinerRealGenesisBlockProducer.php
index 2efe06a35d760b5ff7ff00a190b0ce791b568e80..f8542542795098f20344d8a1d85e356ab77ab434 100644 (file)
--- a/application/hub/classes/producer/miner/blocks/class_MinerRealGenesisBlockProducer.php
+++ b/application/hub/classes/producer/miner/blocks/class_MinerRealGenesisBlockProducer.php
@@ -2,6 +2,11 @@
 // Own namespace
 namespace Org\Shipsimu\Hub\Miner\Producer\Block\Genesis;
 
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Producer\BaseProducer;
+use Org\Shipsimu\Hub\Producer\Block\BaseBlockProducer;
+use Org\Shipsimu\Hub\Producer\Block\BlockProducer;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
 use Org\Mxchange\CoreFramework\Registry\Registerable;

diff --git a/application/hub/classes/producer/miner/blocks/class_MinerTestGenesisBlockProducer.php b/application/hub/classes/producer/miner/blocks/class_MinerTestGenesisBlockProducer.php
index 9120d887ab298463d668ec84919fae2e8eeb77d1..1c5b16f978149488fb28d885f979374642cf43e3 100644 (file)
--- a/application/hub/classes/producer/miner/blocks/class_MinerTestGenesisBlockProducer.php
+++ b/application/hub/classes/producer/miner/blocks/class_MinerTestGenesisBlockProducer.php
@@ -1,4 +1,17 @@
 <?php
+// Own namespace
+namespace Org\Shipsimu\Hub\miner\Producer\Block\Genesis;
+
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Producer\BaseProducer;
+use Org\Shipsimu\Hub\Producer\Block\BaseBlockProducer;
+use Org\Shipsimu\Hub\Producer\Block\BlockProducer;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Registry\Registerable;
+use Org\Mxchange\CoreFramework\State\Stateable;
+
 /**
  * A MinerTestGenesisBlock producer class
  *
@@ -89,4 +102,5 @@ class MinerTestGenesisBlockProducer extends BaseBlockProducer implements BlockPr
                 * to this.
                 */
        }
+
 }

diff --git a/application/hub/classes/producer/miner/class_BaseBlockProducer.php b/application/hub/classes/producer/miner/class_BaseBlockProducer.php
index f6f18b889ee4cfed1a6b26b874be299aede04af1..eeec008213eb92ea429b26da1e5497f0661b4dce 100644 (file)
--- a/application/hub/classes/producer/miner/class_BaseBlockProducer.php
+++ b/application/hub/classes/producer/miner/class_BaseBlockProducer.php
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace Org\Shipsimu\Hub\Producer\Block;
+
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Producer\BaseProducer;
+
 /**
  * A general BlockProducer class
  *

diff --git a/application/hub/classes/states/miner/booting/class_MinerBootingState.php b/application/hub/classes/states/miner/booting/class_MinerBootingState.php
index 60ff2163d699e4eeadb06aa95fd6eb5836c4e5ea..615d96050b45acb3feba35a819bca84febdf7118 100644 (file)
--- a/application/hub/classes/states/miner/booting/class_MinerBootingState.php
+++ b/application/hub/classes/states/miner/booting/class_MinerBootingState.php
@@ -56,9 +56,6 @@ class MinerBootingState extends BaseMinerState implements Stateable {
                // Get new instance
                $stateInstance = new MinerBootingState();
 
-               // Debug message
-               /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('MINER-STATE: Has changed from ' . $minerInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.');
-
                // Return the prepared instance
                return $stateInstance;
        }

diff --git a/application/hub/classes/states/miner/class_BaseMinerState.php b/application/hub/classes/states/miner/class_BaseMinerState.php
index b5779ad0235b5397c8bc812896694575be2a0955..5ac79417ab61de6fed6533218d3cd421b15231c4 100644 (file)
--- a/application/hub/classes/states/miner/class_BaseMinerState.php
+++ b/application/hub/classes/states/miner/class_BaseMinerState.php
@@ -1,6 +1,10 @@
 <?php
 // Own namespace
-namespace Org\Shipsimu\Hub\Miner\State;
+namespace Org\Shipsimu\Hub\State\Miner;
+
+// Import application-specific stuff
+use Org\Shipsimu\Hub\State\Miner\MinerBootingState;
+use Org\Shipsimu\Hub\State\Miner\MinerInitState;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\State\BaseState;

diff --git a/application/hub/classes/states/miner/init/class_MinerInitState.php b/application/hub/classes/states/miner/init/class_MinerInitState.php
index 00e4a77fc66d6f2e4ef3b4b398bd014fc48dac46..194c5aa0a475d9b04d96dbada3e98ff9c9e30877 100644 (file)
--- a/application/hub/classes/states/miner/init/class_MinerInitState.php
+++ b/application/hub/classes/states/miner/init/class_MinerInitState.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Org\Shipsimu\Hub\State\Miner;
 
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Factory\State\Miner\MinerStateFactory;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Executor\Executor;
 use Org\Mxchange\CoreFramework\State\Stateable;

diff --git a/application/hub/classes/tasks/cruncher/class_CruncherKeyProducerTask.php b/application/hub/classes/tasks/cruncher/class_CruncherKeyProducerTask.php
index b70f468e188b337ec3034a42a65c7d94e013b2b4..71d894d59b88c3880c467b2e0637121e258f59ad 100644 (file)
--- a/application/hub/classes/tasks/cruncher/class_CruncherKeyProducerTask.php
+++ b/application/hub/classes/tasks/cruncher/class_CruncherKeyProducerTask.php
@@ -3,9 +3,11 @@
 namespace Org\Shipsimu\Hub\Cruncher\Producer\Key;
 
 // Import application-specific stuff
+use Org\Shipsimu\Hub\Factory\Producer\ProducerFactory;
 use Org\Shipsimu\Hub\Task\BaseHubTask;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Task\BaseTask;
 use Org\Mxchange\CoreFramework\Task\Taskable;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;

diff --git a/application/hub/classes/tasks/cruncher/class_CruncherTestUnitProducerTask.php b/application/hub/classes/tasks/cruncher/class_CruncherTestUnitProducerTask.php
index 4f04633cbb2daa33f4ab07ef2d13653d8c8f2ce3..9c819b648f9fecee46f6fba14c8da191d9750bee 100644 (file)
--- a/application/hub/classes/tasks/cruncher/class_CruncherTestUnitProducerTask.php
+++ b/application/hub/classes/tasks/cruncher/class_CruncherTestUnitProducerTask.php
@@ -3,9 +3,11 @@
 namespace Org\Shipsimu\Hub\Cruncher\Task\Producer\Unit;
 
 // Import application-specific stuff
+use Org\Shipsimu\Hub\Factory\Producer\ProducerFactory;
 use Org\Shipsimu\Hub\Task\BaseHubTask;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Task\BaseTask;
 use Org\Mxchange\CoreFramework\Task\Taskable;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;

diff --git a/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php b/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php
index 49c13e7f76295dc7c2e9f42372070670a72fc52f..a0607139a112d13bc3b153433316fd72719db91c 100644 (file)
--- a/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php
+++ b/application/hub/classes/tasks/miner/block_producer/class_MinerRealGenesisBlockProducerTask.php
@@ -1,8 +1,9 @@
 <?php
 // Own namespace
-namespace Org\Shipsimu\Hub\Miner\Task\Producer\GenesisBlock;
+namespace Org\Shipsimu\Hub\Miner\Task\Producer\Block\Genesis;
 
 // Import application-specific stuff
+use Org\Shipsimu\Hub\Factory\Producer\ProducerFactory;
 use Org\Shipsimu\Hub\Task\BaseHubTask;
 
 // Import framework stuff

diff --git a/application/hub/classes/tasks/miner/block_producer/class_MinerTestGenesisBlockProducerTask.php b/application/hub/classes/tasks/miner/block_producer/class_MinerTestGenesisBlockProducerTask.php
index 8e722f6cfb9c49e83d711c8a5454aa127d11b7cd..e695f4e8de6753c5ce66833505290b06bd6cc536 100644 (file)
--- a/application/hub/classes/tasks/miner/block_producer/class_MinerTestGenesisBlockProducerTask.php
+++ b/application/hub/classes/tasks/miner/block_producer/class_MinerTestGenesisBlockProducerTask.php
@@ -1,11 +1,13 @@
 <?php
 // Own namespace
-namespace Org\Shipsimu\Hub\Miner\Task\Producer\GenesisBlock;
+namespace Org\Shipsimu\Hub\Miner\Task\Producer\Block\Genesis;
 
 // Import application-specific stuff
+use Org\Shipsimu\Hub\Factory\Producer\ProducerFactory;
 use Org\Shipsimu\Hub\Task\BaseHubTask;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Task\BaseTask;
 use Org\Mxchange\CoreFramework\Task\Taskable;
 use Org\Mxchange\CoreFramework\Visitor\Visitable;

diff --git a/application/hub/config.php b/application/hub/config.php
index b726a3a4af751c52a2ce4c78a0c127faf53df90a..d457fef041d8cb0a7fd9b52ab4827d73bc21e0a9 100644 (file)
--- a/application/hub/config.php
+++ b/application/hub/config.php
@@ -969,34 +969,34 @@ $cfg->setConfigEntry('hub_console_cmd_miner_resolver_class', 'Org\Shipsimu\Hub\R
 $cfg->setConfigEntry('miner_php_requirements_filter_class', 'Org\Shipsimu\Hub\Miner\Filter\Requirements\MinerPhpRequirementsFilter');
 
 // CFG: MINER-INITIALIZER-FILTER
-$cfg->setConfigEntry('miner_initializer_filter_class', 'MinerInitializationFilter');
+$cfg->setConfigEntry('miner_initializer_filter_class', 'Org\Shipsimu\Hub\Miner\Filter\Initialization\MinerInitializationFilter');
 
 // CFG: MINER-WELCOME-TEASER-FILTER
-$cfg->setConfigEntry('miner_welcome_teaser_filter_class', 'MinerWelcomeTeaserFilter');
+$cfg->setConfigEntry('miner_welcome_teaser_filter_class', 'Org\Shipsimu\Hub\Miner\Filter\WelcomeTeaser\MinerWelcomeTeaserFilter');
 
 // CFG: MINER-BOOTSTRAP-TASK-HANDLER-INITIALIZER-FILTER
-$cfg->setConfigEntry('miner_bootstrap_task_handler_initializer_filter_class', 'MinerTaskHandlerInitializerFilter');
+$cfg->setConfigEntry('miner_bootstrap_task_handler_initializer_filter_class', 'Org\Shipsimu\Hub\Filter\Initializer\Miner\Handler\Task\MinerTaskHandlerInitializerFilter');
 
 // CFG: CRUNCHER-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER
-$cfg->setConfigEntry('miner_bootstrap_extra_bootstrapping_filter_class', 'MinerBootstrapExtraBootstrappingFilter');
+$cfg->setConfigEntry('miner_bootstrap_extra_bootstrapping_filter_class', 'Org\Shipsimu\Hub\Filter\Bootstrap\Miner\Extra\MinerBootstrapExtraBootstrappingFilter');
 
 // CFG: MINHER-BOOTSTRAP-BUFFER-QUEUE-INITIALIZER-FILTER
-$cfg->setConfigEntry('miner_bootstrap_buffer_queue_initializer_filter_class', 'MinerBootstrapBufferQueueInitializerFilter');
+$cfg->setConfigEntry('miner_bootstrap_buffer_queue_initializer_filter_class', 'Org\Shipsimu\Hub\Filter\Bootstrap\Miner\Queue\MinerBootstrapBufferQueueInitializerFilter');
 
 // CFG: MINER-BOOTSTRAP-GENERIC-ACTIVATION-FILTER
-$cfg->setConfigEntry('miner_bootstrap_generic_activation_filter_class', 'MinerBootstrapGenericActivationFilter');
+$cfg->setConfigEntry('miner_bootstrap_generic_activation_filter_class', 'Org\Shipsimu\Hub\Filter\Bootstrap\Miner\Activation\MinerBootstrapGenericActivationFilter');
 
 // CFG: MINER-SHUTDOWN-FILTER
-$cfg->setConfigEntry('miner_shutdown_filter_class', 'MinerShutdownFilter');
+$cfg->setConfigEntry('miner_shutdown_filter_class', 'Org\Shipsimu\Hub\Filter\Shutdown\Miner\MinerShutdownFilter');
 
 // CFG: MINER-INIT-STATE-CLASS
-$cfg->setConfigEntry('miner_init_state_class', 'MinerInitState');
+$cfg->setConfigEntry('miner_init_state_class', 'Org\Shipsimu\Hub\State\Miner\MinerInitState');
 
 // CFG: MINER-BOOTING-STATE-CLASS
-$cfg->setConfigEntry('miner_booting_state_class', 'MinerBootingState');
+$cfg->setConfigEntry('miner_booting_state_class', 'Org\Shipsimu\Hub\State\Miner\MinerBootingState');
 
 // CFG: MINER-BLOCK-FETCHER-TASK-CLASS
-$cfg->setConfigEntry('miner_block_fetcher_task_class', 'MinerBlockFetcherTask');
+$cfg->setConfigEntry('miner_block_fetcher_task_class', 'Org\Shipsimu\Hub\Miner\Task\Fetcher\Block\MinerBlockFetcherTask');
 
 // CFG: TASK-MINER-BLOCK-FETCHER-STARTUP-DELAY
 $cfg->setConfigEntry('task_miner_block_fetcher_startup_delay', 1000);
@@ -1008,7 +1008,7 @@ $cfg->setConfigEntry('task_miner_block_fetcher_interval_delay', 1000);
 $cfg->setConfigEntry('task_miner_block_fetcher_max_runs', 0);
 
 // CFG: MINER-TEST-GENESIS-BLOCK-PRODUCER-TASK-CLASS
-$cfg->setConfigEntry('miner_test_genesis_block_producer_task_class', 'MinerTestGenesisBlockProducerTask');
+$cfg->setConfigEntry('miner_test_genesis_block_producer_task_class', 'Org\Shipsimu\Hub\Miner\Task\Producer\Block\Genesis\MinerTestGenesisBlockProducerTask');
 
 // CFG: TASK-MINER-TEST-GENESIS-BLOCK-PRODUCER-STARTUP-DELAY
 $cfg->setConfigEntry('task_miner_test_genesis_block_producer_startup_delay', 1000);
@@ -1020,7 +1020,7 @@ $cfg->setConfigEntry('task_miner_test_genesis_block_producer_interval_delay', 10
 $cfg->setConfigEntry('task_miner_test_genesis_block_producer_max_runs', 0);
 
 // CFG: MINER-REAL-GENESIS-BLOCK-PRODUCER-TASK-CLASS
-$cfg->setConfigEntry('miner_real_genesis_block_producer_task_class', 'MinerRealGenesisBlockProducerTask');
+$cfg->setConfigEntry('miner_real_genesis_block_producer_task_class', 'Org\Shipsimu\Hub\Miner\Task\Producer\Block\Genesis\MinerRealGenesisBlockProducerTask');
 
 // CFG: TASK-MINER-REAL-GENESIS-BLOCK-PRODUCER-STARTUP-DELAY
 $cfg->setConfigEntry('task_miner_real_genesis_block_producer_startup_delay', 500);
@@ -1032,7 +1032,7 @@ $cfg->setConfigEntry('task_miner_real_genesis_block_producer_interval_delay', 10
 $cfg->setConfigEntry('task_miner_real_genesis_block_producer_max_runs', 0);
 
 // CFG: MINER_NODE-COMMUNICATOR-TASK-CLASS
-$cfg->setConfigEntry('miner_node_communicator_task_class', 'MinerNodeCommunicatorTask');
+$cfg->setConfigEntry('miner_node_communicator_task_class', 'Org\Shipsimu\Hub\Miner\Task\Communicator\Node\MinerNodeCommunicatorTask');
 
 // CFG: TASK-MINER_NODE-COMMUNICATOR-STARTUP-DELAY
 $cfg->setConfigEntry('task_miner_node_communicator_startup_delay', 500);
@@ -1044,19 +1044,22 @@ $cfg->setConfigEntry('task_miner_node_communicator_interval_delay', 250);
 $cfg->setConfigEntry('task_miner_node_communicator_max_runs', 0);
 
 // CFG: MINER-TEST-GENESIS-BLOCK-PRODUCER-CLASS
-$cfg->setConfigEntry('miner_test_genesis_block_producer_class', 'MinerTestGenesisBlockProducer');
+$cfg->setConfigEntry('miner_test_genesis_block_producer_class', 'Org\Shipsimu\Hub\miner\Producer\Block\Genesis\MinerTestGenesisBlockProducer');
 
 // CFG: MINER-REAL-GENESIS-BLOCK-PRODUCER-CLASS
-$cfg->setConfigEntry('miner_real_genesis_block_producer_class', 'MinerRealGenesisBlockProducer');
+$cfg->setConfigEntry('miner_real_genesis_block_producer_class', 'Org\Shipsimu\Hub\Miner\Producer\Block\Genesis\MinerRealGenesisBlockProducer');
 
 // CFG: MINER-NODE-COMMUNICATOR-CLASS
-$cfg->setConfigEntry('miner_node_communicator_class', 'MinerNodeCommunicator');
+$cfg->setConfigEntry('miner_node_communicator_class', 'Org\Shipsimu\Hub\Miner\Communicator\Node\MinerNodeCommunicator');
 
 // CFG: MINER-TEST-HASH-BLOCK-CLASS
-$cfg->setConfigEntry('miner_test_hash_block_class', 'HashBlock');
+$cfg->setConfigEntry('miner_test_hash_block_class', 'Org\Shipsimu\Hub\Block\Hash\HashBlock');
 
 // CFG: MINER-REAL-HASH-BLOCK-CLASS
-$cfg->setConfigEntry('miner_real_hash_block_class', 'HashBlock');
+$cfg->setConfigEntry('miner_real_hash_block_class', 'Org\Shipsimu\Hub\Block\Hash\HashBlock');
+
+// CFG: HUB-COIN-MINER-MODE-CLASS
+$cfg->setConfigEntry('hub_coin_miner_mode_class', 'Org\Shipsimu\Hub\Miner\HubCoinMiner');
 
 ///////////////////////////////////////////////////////////////////////////////
 //                        Cruncher configuration

diff --git a/application/hub/interfaces/blocks/class_Minable.php b/application/hub/interfaces/blocks/class_Minable.php
index eeb384b51da70464dfdd2455dd377795eedef749..aa1f47617ab7679e66781f4a4429e25a45cdaead 100644 (file)
--- a/application/hub/interfaces/blocks/class_Minable.php
+++ b/application/hub/interfaces/blocks/class_Minable.php
@@ -30,6 +30,3 @@ use Org\Shipsimu\Hub\Generic\HubInterface;
  */
 interface Minable extends HubInterface {
 }
-
-// [EOF]
-?>

diff --git a/application/hub/interfaces/miner/class_MinerHelper.php b/application/hub/interfaces/miner/class_MinerHelper.php
index cb77e82fe153892a866e1c07452765f2dec72a23..64f08745db60531865a3250342488f55d7bc15ef 100644 (file)
--- a/application/hub/interfaces/miner/class_MinerHelper.php
+++ b/application/hub/interfaces/miner/class_MinerHelper.php
@@ -4,6 +4,7 @@ namespace Org\Shipsimu\Hub\Helper\Miner;
 
 // Import application-specific stuff
 use Org\Shipsimu\Hub\Generic\HubInterface;
+use Org\Shipsimu\Hub\Producer\Block\BlockProducer;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Controller\Controller;
@@ -98,7 +99,5 @@ interface MinerHelper extends HubInterface {
         * @return      void
         */
        function blockProducerHasInitialized (BlockProducer $producerInstance);
-}
 
-// [EOF]
-?>
+}

diff --git a/application/hub/interfaces/producer/block/class_BlockProducer.php b/application/hub/interfaces/producer/block/class_BlockProducer.php
index f46d776eff7d6d6dea1f858af7f4c6e7e2d329bf..5ab499a2e615e64e33208969db1d82c14fce9057 100644 (file)
--- a/application/hub/interfaces/producer/block/class_BlockProducer.php
+++ b/application/hub/interfaces/producer/block/class_BlockProducer.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace Org\Shipsimu\Hub\Producer\Block;
 
+// Import application-specific stuff
+use Org\Shipsimu\Hub\Producer\Producer;
+
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Executor\Executor;
 use Org\Mxchange\CoreFramework\State\Stateable;

diff --git a/application/hub/interfaces/producer/class_Producer.php b/application/hub/interfaces/producer/class_Producer.php
index c0abd4f1e1f118de01de14be2371d9a773665969..004798a6acfec60444869c0f89b31247f0a42160 100644 (file)
--- a/application/hub/interfaces/producer/class_Producer.php
+++ b/application/hub/interfaces/producer/class_Producer.php
@@ -29,6 +29,3 @@ use Org\Shipsimu\Hub\Generic\HubInterface;
  */
 interface Producer extends HubInterface {
 }
-
-// [EOF]
-?>

diff --git a/core b/core
index d1d4c27a298fb48a433ab3ee132229d88274b060..6d6b58a1042e6ad5d6277f8ff5144c95f1abd427 160000 (submodule)
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit d1d4c27a298fb48a433ab3ee132229d88274b060
+Subproject commit 6d6b58a1042e6ad5d6277f8ff5144c95f1abd427