Change MG test with flag filter logic

stratum-mining · Jul 18, 2024 · 90f226c · 90f226c
1 parent f25da58
commit 90f226c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/protocols/v2/subprotocols/common-messages/src/setup_connection.rs b/protocols/v2/subprotocols/common-messages/src/setup_connection.rs
@@ -91,11 +91,12 @@ impl<'decoder> SetupConnection<'decoder> {
                 let requires_async_job_mining_passed = (required >> 31) & 1 > 0;
                 let requires_async_job_mining_self = (available >> 31) & 1 > 0;
 
-                let specific_flags_check =
-                    !requires_async_job_mining_self || requires_async_job_mining_passed;
-                let general_flags_check = (available & required) == required;
-
-                specific_flags_check && general_flags_check
+                match (requires_async_job_mining_self, requires_async_job_mining_passed) {
+                    (true, true) => true,
+                    (true, false) => true,
+                    (false, true) => false,
+                    (false, false) => true,
+                }
             }
             Protocol::TemplateDistributionProtocol | Protocol::JobDistributionProtocol => {
                 // These protocols do not define flags for setting up a connection.
@@ -423,14 +424,6 @@ mod test {
             available_flags,
             required_flags
         ));
-
-        let available_flags = 0b_0000_0000_0000_0000_0000_0000_0000_0000;
-        let required_flags = 0b_1000_0000_0000_0000_0000_0000_0000_0000;
-        assert!(!SetupConnection::check_flags(
-            protocol,
-            available_flags,
-            required_flags
-        ));
     }
 
     #[test]

diff --git a/roles/jd-server/src/lib/job_declarator/mod.rs b/roles/jd-server/src/lib/job_declarator/mod.rs
@@ -477,8 +477,8 @@ impl JobDeclarator {
                             let flag = setup_connection.flags;
                             let is_valid = SetupConnection::check_flags(
                                 Protocol::JobDeclarationProtocol,
-                                flag,
                                 1,
+                                flag,
                             );
 
                             if is_valid {

diff --git a/test/message-generator/mock/jdc-mock-jds-setup-connection-mock-invalid-flag.json b/test/message-generator/mock/jdc-mock-jds-setup-connection-mock-invalid-flag.json
@@ -18,8 +18,17 @@
             "role": "client",
             "results": [
                 {
-                    "type": "match_message_type",
-                    "value": "0x02"
+                    "type": "match_message_field",
+                    "value": [
+                        "CommonMessages",
+                        "SetupConnectionSuccess",
+                        [
+                            [
+                                "flags",
+                                {"U32": 1}
+                            ]
+                        ]
+                    ]
                 }
             ],
             "actiondoc": "This action sends SetupConnection and checks that .Error"