From 0bda8ecb41f787679f386a52f909f48ff094ae52 Mon Sep 17 00:00:00 2001 From: GTO90 Date: Sun, 15 Dec 2024 12:04:45 -0600 Subject: [PATCH 1/2] tests: Add Taproot soft fork status to getblockchaininfo test This commit updates the `rpc_blockchain.py` functional test to include the Taproot soft fork status in the `getblockchaininfo` RPC call. The Taproot soft fork is defined using the BIP9 activation mechanism with specific start and timeout times. The test verifies that the Taproot soft fork is correctly reported as "defined" and not yet active. Changes include: - Adding Taproot soft fork details to the expected `softforks` field in the `getblockchaininfo` test. - Ensuring the test checks for the correct status, start time, timeout, and activation state of the Taproot soft fork. This update ensures that the `getblockchaininfo` RPC call accurately reflects the status of the Taproot soft fork, which is crucial for testing and validation purposes. Refs https://github.com/DigiByte-Core/digibyte/pull/244 --- .vscode/settings.json | 13 ++++++++++++- test/functional/rpc_blockchain.py | 26 ++++++++++++-------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 07dc4501aa..e525a3318f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -26,5 +26,16 @@ "cinttypes": "cpp", "typeindex": "cpp", "ios": "cpp" - } + }, + "cmake.ignoreCMakeListsMissing": true, + "boost-test-adapter-robaho.tests": [ + { + "testExecutables": [ + { + "glob": "**/*{_test,_test.exe}" + } + ], + "debugConfig": "Test Config" + } + ], } \ No newline at end of file diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py index 8b8e123034..2bb182e0a8 100755 --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -151,20 +151,18 @@ def _test_getblockchaininfo(self): 'type': 'buried', 'active': False, 'height': 1000000 # due to easypow - } - # Taproot code was removed from getblockchaininfo for time being - # 'taproot': { - # 'type': 'bip9', - # 'bip9': { - # 'status': 'active', - # 'start_time': -1, - # 'timeout': 9223372036854775807, - # 'since': 0, - # 'min_activation_height': 0, - # }, - # 'height': 0, - # 'active': True - # } + }, + 'taproot': { + 'type': 'bip9', + 'bip9': { + 'status': 'defined', + 'start_time': 4070908800, + 'timeout': 4099766400, + 'since': 0, + 'min_activation_height': 0, + }, + 'active': False + } }) def _test_getchaintxstats(self): From 698a43abe53b04ea79a8a96edcac03726abde40f Mon Sep 17 00:00:00 2001 From: GTO90 Date: Sun, 15 Dec 2024 16:51:31 -0600 Subject: [PATCH 2/2] workspace: Add digibyte.code-workspace for VS Code configuration This commit adds a new `digibyte.code-workspace` file to the repository. This file is used to configure the Visual Studio Code workspace settings for the DigiByte Core project. The `digibyte.code-workspace` file includes: - Folder settings for the project. - File associations to ensure proper syntax highlighting for various C++ standard library headers. - GitHub Copilot advanced settings to specify project directories. This addition aims to improve the development experience for contributors using Visual Studio Code by providing a pre-configured workspace setup. --- digibyte.code-workspace | 58 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 digibyte.code-workspace diff --git a/digibyte.code-workspace b/digibyte.code-workspace new file mode 100644 index 0000000000..7053c3216a --- /dev/null +++ b/digibyte.code-workspace @@ -0,0 +1,58 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "files.associations": { + "chrono": "cpp", + "initializer_list": "cpp", + "cctype": "cpp", + "cmath": "cpp", + "csignal": "cpp", + "cstdarg": "cpp", + "cstddef": "cpp", + "cstdio": "cpp", + "cstdlib": "cpp", + "cstring": "cpp", + "ctime": "cpp", + "cwchar": "cpp", + "cwctype": "cpp", + "atomic": "cpp", + "strstream": "cpp", + "condition_variable": "cpp", + "cstdint": "cpp", + "future": "cpp", + "iosfwd": "cpp", + "mutex": "cpp", + "ratio": "cpp", + "system_error": "cpp", + "thread": "cpp", + "cinttypes": "cpp", + "typeindex": "cpp", + "ios": "cpp" + }, + "github.copilot.advanced": { + "projectDirectories": [ + ".github", + "src", + "test", + "doc", + "qa" + ], + "excludeDirectories": [ + "**/.deps", + "**/.libs", + "**/.obj" + ], + "excludeFiles": [ + "*.a", + "*.o", + "*.Po", + "*.pc", + "*.log", + ] + } + } +} \ No newline at end of file