Changes needed corresponding to plenum (hyperledger#161)

* some refactoring * Update Jenkinsfile * Update setup.py * Update setup.py * Update Jenkinsfile * Update setup.py * Feature/migrations (hyperledger#159) * Updated node control tool * Updated node control tool Added migration_tool * Completed migration_tool * Updated migration tool Added test for migration tool * Custom logger was deprecated * Updated migration tool * Migration test * Updated migration README * Code review fixes * Deps update * bump dependency version * removing some jenkins steps * Update Jenkinsfile
SeanBohan · Jun 1, 2017 · c82c4e4 · c82c4e4
1 parent d19b16c
commit c82c4e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/setup.py b/setup.py
@@ -73,7 +73,7 @@ def run(self):
     data_files=[(
         (BASE_DIR, ['data/nssm_original.exe'])
     )],
-    install_requires=['sovrin-common-dev==0.2.74', 'python-dateutil'],
+    install_requires=['sovrin-common-dev==0.2.75', 'python-dateutil'],
     setup_requires=['pytest-runner'],
     tests_require=['pytest', 'sovrin-client-dev==0.3.116'],
     scripts=['scripts/start_sovrin_node',

diff --git a/sovrin_node/server/node.py b/sovrin_node/server/node.py
@@ -7,6 +7,7 @@
 from ledger.serializers.compact_serializer import CompactSerializer
 from ledger.serializers.json_serializer import JsonSerializer
 from ledger.stores.file_hash_store import FileHashStore
+from orderedset._orderedset import OrderedSet
 from state.pruning_state import PruningState
 
 from plenum.common.constants import VERSION, \
@@ -86,12 +87,11 @@ def __init__(self,
         self.ledgerManager.addLedger(CONFIG_LEDGER_ID, self.configLedger,
                                      postCatchupCompleteClbk=self.postConfigLedgerCaughtUp,
                                      postTxnAddedToLedgerClbk=self.postTxnFromCatchupAddedToLedger)
+        self.on_new_ledger_added(CONFIG_LEDGER_ID)
         self.states[CONFIG_LEDGER_ID] = self.loadConfigState()
         self.upgrader = self.getUpgrader()
         self.configReqHandler = self.getConfigReqHandler()
         self.initConfigState()
-        for r in self.replicas:
-            r.requestQueues[CONFIG_LEDGER_ID] = deque()
         self.requestExecuter[CONFIG_LEDGER_ID] = self.executeConfigTxns
 
         self.nodeMsgRouter.routes[Request] = self.processNodeRequest
@@ -135,6 +135,10 @@ def send_ledger_status_to_newly_connected_node(self, node_name):
         if self.ledgerManager.ledgerRegistry[DOMAIN_LEDGER_ID].state == LedgerState.synced:
             self.sendConfigLedgerStatus(node_name)
 
+    @property
+    def ledger_ids(self):
+        return super().ledger_ids + [CONFIG_LEDGER_ID]
+
     def getUpgrader(self):
         return Upgrader(self.id,
                         self.name,