use parent folder as root of project and remove thesis specific stuff

.gitignore

@@ -1,5 +1,103 @@
-/src/bitcoin
 /data
-/datadirs
 .vscode
 .idea
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+.venv
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+log
+logs
+forks
+datadirs
+
+# Intellij
+*.iml

code/config.py

@@ -4,10 +4,6 @@
 # it does not conflict with https://github.com/bitcoin/bitcoin/blob/master/src/netbase.h
 ip_range = "240.0.0.0/4"
 
-out_dir = 'out'
-sim_dir = '{}/run-{}/'.format(out_dir, time.time())
-aggregated_log_file = sim_dir + 'log'
-
 network_name = 'simcoin-network'
 node_image = 'btn/base:v3'
 prefix = 'simcoin-'
@@ -19,17 +15,19 @@
 selfish_node_name = selfish_node_prefix + '{}'
 selfish_node_proxy_name = selfish_node_name + selfish_node_proxy_postfix
 
-network_config = 'network.csv'
-interval_csv = 'intervals.csv'
-nodes_config_json = 'nodes_config.json'
-aggregated_log = sim_dir + 'aggregated.log'
-log_file = 'debug.log'
-tmp_log = sim_dir + 'tmp.log'
-blocks_csv = sim_dir + 'blocks.csv'
-chains_csv = sim_dir + 'chains.csv'
-consensus_chain_csv = sim_dir + 'consensus_chain.csv'
-nodes_csv = sim_dir + 'nodes.csv'
-tx_csv = sim_dir + 'tx.csv'
+data_dir = '../data/'
+sim_dir = '{}run-{}/'.format(data_dir, time.time())
+network_config = data_dir + 'network.csv'
+interval_csv = data_dir + 'intervals.csv'
+nodes_config_json = data_dir + 'nodes_config.json'
+aggregated_log = data_dir + sim_dir + 'aggregated.log'
+log_file = data_dir + 'debug.log'
+tmp_log = data_dir + sim_dir + 'tmp.log'
+blocks_csv = data_dir + sim_dir + 'blocks.csv'
+chains_csv = data_dir + sim_dir + 'chains.csv'
+consensus_chain_csv = data_dir + sim_dir + 'consensus_chain.csv'
+nodes_csv = data_dir + sim_dir + 'nodes.csv'
+tx_csv = data_dir + sim_dir + 'tx.csv'
 
 reference_node = 'node-0'
 

code/prepare.py

@@ -41,8 +41,6 @@ def run_nodes(nodes):
 
 
 def prepare_simulation_dir():
-    if not os.path.exists(config.out_dir):
-        os.makedirs(config.out_dir)
     if not os.path.exists(config.sim_dir):
         os.makedirs(config.sim_dir)