jolteon: clean up/refactor jolteon tests

Author: ladamesny

e2e-tests/src/substrate_api.py

@@ -47,32 +47,32 @@ def __init__(self, config: ApiConfig, secrets, db_sync: Session):
         substrate_url = config.nodes_config.node.url
 
         # Handle different URL schemes and convert to appropriate WebSocket scheme
-        if substrate_url.startswith('https://'):
-            # HTTPS to WSS
-            substrate_url = substrate_url.replace('https://', 'wss://')
-            if not substrate_url.endswith('/ws'):
-                substrate_url += '/ws'
-        elif substrate_url.startswith('http://'):
-            # HTTP to WS
-            substrate_url = substrate_url.replace('http://', 'ws://')
-            if not substrate_url.endswith('/ws'):
-                substrate_url += '/ws'
-        elif substrate_url.startswith('ws://'):
-            # Plain WS - check if port suggests HTTPS (443) and upgrade to WSS
-            if ':443' in substrate_url:
-                substrate_url = substrate_url.replace('ws://', 'wss://')
-            if not substrate_url.endswith('/ws'):
-                substrate_url += '/ws'
-        elif substrate_url.startswith('wss://'):
-            # Already WSS, just ensure /ws path
-            if not substrate_url.endswith('/ws'):
-                substrate_url += '/ws'
-        else:
-            # No protocol specified, assume secure WebSocket for port 443, otherwise plain WS
-            if ':443' in substrate_url or substrate_url.endswith(':443'):
-                substrate_url = f'wss://{substrate_url}/ws'
-            else:
-                substrate_url = f'ws://{substrate_url}/ws'
+        def ensure_ws_path(url: str) -> str:
+            """Ensure the URL ends with /ws path"""
+            return url if url.endswith('/ws') else f"{url}/ws"
+        
+        match substrate_url.split('://', 1):
+            case ['https', rest]:
+                # HTTPS to WSS
+                substrate_url = ensure_ws_path(f'wss://{rest}')
+            case ['http', rest]:
+                # HTTP to WS
+                substrate_url = ensure_ws_path(f'ws://{rest}')
+            case ['ws', rest]:
+                # Plain WS - check if port suggests HTTPS (443) and upgrade to WSS
+                if ':443' in rest:
+                    substrate_url = ensure_ws_path(f'wss://{rest}')
+                else:
+                    substrate_url = ensure_ws_path(f'ws://{rest}')
+            case ['wss', rest]:
+                # Already WSS, just ensure /ws path
+                substrate_url = ensure_ws_path(f'wss://{rest}')
+            case _:
+                # No protocol specified, assume secure WebSocket for port 443, otherwise plain WS
+                if ':443' in substrate_url or substrate_url.endswith(':443'):
+                    substrate_url = f'wss://{substrate_url}/ws'
+                else:
+                    substrate_url = f'ws://{substrate_url}/ws'
 
         self.url = substrate_url
         logger.info(f"Substrate WebSocket URL: {self.url}")

e2e-tests/tests/README_jolteon_consensus.md

@@ -68,28 +68,6 @@ pytest tests/ -m jolteon --env jolteon_docker
 pytest tests/ -m jolteon --blockchain substrate
 ```
 
-## Test Implementation Strategy
-
-### Phase 1: Basic Functionality (Current)
-- ✅ QC formation and round advancement
-- ✅ Authority rotation verification
-- ✅ Metadata availability exploration
-
-### Phase 2: Core Protocol Rules (Next)
-- 🔄 2-chain commit rule verification
-- 🔄 Safety properties validation
-- 🔄 Liveness guarantees testing
-
-### Phase 3: Fault Tolerance (Future)
-- ⏳ Timeout mechanism testing
-- ⏳ TC formation verification
-- ⏳ Byzantine leader handling
-
-### Phase 4: Performance and Limits (Future)
-- ⏳ Asynchronous condition testing
-- ⏳ DDoS attack simulation
-- ⏳ Performance benchmarking
-
 ## Understanding the Tests
 
 ### What These Tests Verify
@@ -108,9 +86,8 @@ pytest tests/ -m jolteon --blockchain substrate
 
 ### Adding New Test Cases
 1. Follow the existing test structure and naming conventions
-2. Use appropriate test keys (JOLTEON-XXX)
-3. Include comprehensive logging for debugging
-4. Add proper error handling and graceful degradation
+2. Include comprehensive logging for debugging
+3. Add proper error handling and graceful degradation
 
 ### Modifying Test Parameters
 - Adjust wait times based on your network characteristics
@@ -142,15 +119,13 @@ pytest tests/test_jolteon_consensus.py::TestJolteonConsensus::test_qc_formation_
 ## Contributing
 
 When adding new test cases:
-1. Follow the Tachyeon test case document structure
-2. Implement tests incrementally (simple → complex)
-3. Include proper documentation and logging
-4. Test thoroughly in your Jolteon environment
-5. Update this README with new test information
+1. Implement tests incrementally (simple → complex)
+2. Include proper documentation and logging
+3. Test thoroughly in your Jolteon environment
+4. Update this README with new test information
 
 ## References
 
-- [Tachyeon Test Cases Document](../docs/tachyeon-test-cases.md)
 - [Jolteon Consensus Protocol Specification](https://eprint.iacr.org/2021/319)
 - [Substrate Interface Documentation](https://github.com/polkascan/py-substrate-interface)
 - [Partner Chains E2E Testing Guide](../README.md)