Merge pull request DigiByte-Core#254 from DigiByte-Core/bugfix/functi…

…onal-test-rpc_blockchain tests, workspace: Add Taproot soft fork status to getblockchaininfo test and VS Code workspace configuration
JaredTate · Dec 16, 2024 · c336e5d · c336e5d
2 parents cca171c + 698a43a
commit c336e5d
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 15 deletions.
diff --git 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"
+    }
+  ],
 }
diff --git a/digibyte.code-workspace 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",
+			]
+		}
+	}
+}
diff --git 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):