Merge branch 'development' into network-domain-hashers

tari-project · Nov 28, 2023 · dd4245a · dd4245a
2 parents a0d3b96 + 0b0eab8
commit dd4245a
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/integration_tests/log4rs/cucumber.yml b/integration_tests/log4rs/cucumber.yml
@@ -107,9 +107,25 @@ appenders:
         kind: fixed_window
         base: 1
         count: 5
-        pattern: "{{log_dir}}/log/miner/miner.{}.log"
+        pattern: "{{log_dir}}/log/miner.{}.log"
     encoder:
-      pattern: "{d(%Y-%m-%d %H:%M:%S.%f)} [{t}] [Thread:{I}] {l:5} {m}{n}"
+      pattern: "{d(%Y-%m-%d %H:%M:%S.%f)} [{X(grpc)}] {f}.{L} {i} [{t}] {l:5} {m}{n}"
+  # An appender named "proxy" that writes to a file with a custom pattern encoder
+  proxy:
+    kind: rolling_file
+    path: "{{log_dir}}/log/proxy.log"
+    policy:
+      kind: compound
+      trigger:
+        kind: size
+        limit: 200mb
+      roller:
+        kind: fixed_window
+        base: 1
+        count: 50
+        pattern: "{{log_dir}}/log/proxy.{}.log"
+    encoder:
+      pattern: "{d(%Y-%m-%d %H:%M:%S.%f)} [{X(grpc)}] {f}.{L} {i} [{t}] {l:5} {m}{n}"
 
 # We don't want prints during cucumber test, everything useful will in logs.
 # root:
@@ -125,6 +141,7 @@ loggers:
       - base_layer_wallet
       - base_layer_base_node
       - miner
+      - proxy
     additive: true
   stdout:
     level: info # we have only single print, and it's info
@@ -168,6 +185,12 @@ loggers:
     appenders:
       - miner
     additive: false
+  # merge mining proxy
+  minotari_mm_proxy::proxy:
+    level: debug
+    appenders:
+      - proxy
+    additive: false
   # Route log events sent to the "comms" logger to the "network" appender
   comms:
     level: debug

diff --git a/integration_tests/src/merge_mining_proxy.rs b/integration_tests/src/merge_mining_proxy.rs
@@ -133,10 +133,10 @@ impl MergeMiningProxyProcess {
                             origin_submission.to_string(),
                         ),
                         (
-                            "miner.wallet_payment_address".to_string(),
+                            "merge_mining_proxy.wallet_payment_address".to_string(),
                             wallet_payment_address.to_hex(),
                         ),
-                        ("miner.stealth_payment".to_string(), stealth.to_string()),
+                        ("merge_mining_proxy.stealth_payment".to_string(), stealth.to_string()),
                     ],
                 },
             };

diff --git a/integration_tests/tests/features/MergeMining.feature b/integration_tests/tests/features/MergeMining.feature
@@ -4,7 +4,6 @@
 @merge-mining @base-node
 Feature: Merge Mining
 
-  @broken
   Scenario: Merge Mining Functionality Test Without Submitting To Origin
     Given I have a seed node NODE
     When I have wallet WALLET connected to all seed nodes
@@ -17,7 +16,6 @@ Feature: Merge Mining
     When I submit a block through proxy PROXY
     Then Proxy response block submission is valid without submitting to origin
 
-  @broken
   Scenario: Merge Mining Functionality Test With Submitting To Origin
     Given I have a seed node NODE
     When I have wallet WALLET connected to all seed nodes
@@ -33,12 +31,10 @@ Feature: Merge Mining
     When I ask for a block header by hash using last block header from proxy PROXY
     Then Proxy response for block header by hash is valid
 
-  # BROKEN: get_block_template returns error 500
-  @critical @broken
+  @critical
   Scenario: Simple Merge Mining
     Given I have a seed node NODE
     When I have wallet WALLET connected to all seed nodes
     And I have a merge mining proxy PROXY connected to NODE and WALLET with default config
     When I merge mine 2 blocks via PROXY
     Then all nodes are at height 2
-