From c5edcc329f26b68b2bb753bc74ec0ea95c4414bf Mon Sep 17 00:00:00 2001
From: Pedro Ferreira <pedro@hathor.network>
Date: Mon, 6 Nov 2023 23:57:57 -0300
Subject: [PATCH] tests: use yml as configuration file for hathor core

---
 .../configuration/docker-compose.yml          |  2 +-
 .../integration/configuration/privnet.py      | 31 ------------------
 .../integration/configuration/privnet.yml     | 32 +++++++++++++++++++
 3 files changed, 33 insertions(+), 32 deletions(-)
 delete mode 100644 __tests__/integration/configuration/privnet.py
 create mode 100644 __tests__/integration/configuration/privnet.yml

diff --git a/__tests__/integration/configuration/docker-compose.yml b/__tests__/integration/configuration/docker-compose.yml
index 96b89d711..b10250c8f 100644
--- a/__tests__/integration/configuration/docker-compose.yml
+++ b/__tests__/integration/configuration/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       "--memory-storage",
     ]
     environment:
-      HATHOR_CONFIG_FILE: privnet.conf.privnet
+      HATHOR_CONFIG_YAML: privnet/conf/privnet.yml
     ports:
       - "8083:8080"
       - "40404:40404"
diff --git a/__tests__/integration/configuration/privnet.py b/__tests__/integration/configuration/privnet.py
deleted file mode 100644
index e2831e01e..000000000
--- a/__tests__/integration/configuration/privnet.py
+++ /dev/null
@@ -1,31 +0,0 @@
-from hathor.conf.settings import HathorSettings
-
-# This file is the Private Network Configuration for the Fullnode
-# It is consumed by the docker-compose.yml file on the integration folder.
-# For more information, refer to:
-# https://github.com/HathorNetwork/rfcs/blob/master/text/0033-private-network-guide.md
-
-# This genesis adds the funds to the following wallet seed:
-# avocado spot town typical traffic vault danger century property shallow divorce festival spend attack anchor afford rotate green audit adjust fade wagon depart level
-
-SETTINGS = HathorSettings(
-    P2PKH_VERSION_BYTE=b'\x49',
-    MULTISIG_VERSION_BYTE=b'\x87',
-    NETWORK_NAME='privatenet',
-    BOOTSTRAP_DNS=[],
-    ENABLE_PEER_WHITELIST=False,
-    # Genesis stuff
-    GENESIS_OUTPUT_SCRIPT=bytes.fromhex("76a91466665b27f7dbc4c8c089d2f686c170c74d66f0b588ac"),
-    GENESIS_TIMESTAMP=1643902665,
-    MIN_TX_WEIGHT_K=0,
-    MIN_TX_WEIGHT_COEFFICIENT=0,
-    MIN_TX_WEIGHT=1,
-    REWARD_SPEND_MIN_BLOCKS=1,
-
-    GENESIS_BLOCK_HASH=bytes.fromhex('00000334a21fbb58b4db8d7ff282d018e03e2977abd3004cf378fb1d677c3967'),
-    GENESIS_BLOCK_NONCE=4784939,
-    GENESIS_TX1_HASH=bytes.fromhex('54165cef1fd4cf2240d702b8383c307c822c16ca407f78014bdefa189a7571c2'),
-    GENESIS_TX1_NONCE=0,
-    GENESIS_TX2_HASH=bytes.fromhex('039906854ce6309b3180945f2a23deb9edff369753f7082e19053f5ac11bfbae'),
-    GENESIS_TX2_NONCE=0
-)
diff --git a/__tests__/integration/configuration/privnet.yml b/__tests__/integration/configuration/privnet.yml
new file mode 100644
index 000000000..ea8d82b06
--- /dev/null
+++ b/__tests__/integration/configuration/privnet.yml
@@ -0,0 +1,32 @@
+# This file is the Private Network Configuration for the Fullnode
+# It is consumed by the docker-compose.yml file on the integration folder.
+# For more information, refer to:
+# https://github.com/HathorNetwork/rfcs/blob/master/text/0033-private-network-guide.md
+
+# This genesis adds the funds to the following wallet seed:
+# avocado spot town typical traffic vault danger century property shallow divorce festival spend attack anchor afford rotate green audit adjust fade wagon depart level
+
+P2PKH_VERSION_BYTE: x49
+MULTISIG_VERSION_BYTE: x87
+NETWORK_NAME: privatenet
+BOOTSTRAP_DNS: []
+ENABLE_PEER_WHITELIST: false
+
+# Genesis stuff
+GENESIS_OUTPUT_SCRIPT: 76a91466665b27f7dbc4c8c089d2f686c170c74d66f0b588ac
+GENESIS_BLOCK_TIMESTAMP: 1643902665
+GENESIS_BLOCK_NONCE: 4784939
+GENESIS_BLOCK_HASH: 00000334a21fbb58b4db8d7ff282d018e03e2977abd3004cf378fb1d677c3967
+GENESIS_TX1_NONCE: 0
+GENESIS_TX1_HASH: 54165cef1fd4cf2240d702b8383c307c822c16ca407f78014bdefa189a7571c2
+GENESIS_TX2_NONCE: 0
+GENESIS_TX2_HASH: 039906854ce6309b3180945f2a23deb9edff369753f7082e19053f5ac11bfbae
+
+MIN_TX_WEIGHT_K: 0
+MIN_TX_WEIGHT_COEFFICIENT: 0
+MIN_TX_WEIGHT: 1
+REWARD_SPEND_MIN_BLOCKS: 1
+
+CHECKPOINTS: []
+
+extends: mainnet.yml
\ No newline at end of file