Skip to content

Commit

Permalink
Merge pull request #2167 from blockstack/next
Browse files Browse the repository at this point in the history 
Merge Xenon v2
  • Loading branch information
@kantai
kantai authored Dec 14, 2020
2 parents 154f99f + 0c12b62 commit 1a34c15
Show file tree
Hide file tree
Showing 204 changed files with 423,551 additions and 6,010 deletions.
2 changes: 1 addition & 1 deletion .github/actions/bitcoin-int-tests/Dockerfile.bitcoin-tests
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ RUN cd / && tar -xvzf bitcoin-0.20.0-x86_64-linux-gnu.tar.gz
RUN ln -s /bitcoin-0.20.0/bin/bitcoind /bin/

ENV BITCOIND_TEST 1
RUN cargo test --workspace --bin=stacks-node -- --test-threads 1 --ignored
RUN cd testnet/stacks-node && cargo test --release --features prod-genesis-chainstate -- --test-threads 1 --ignored
180 changes: 142 additions & 38 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'blockstack_lib'",
"name": "executable 'blockstack-core'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"build",
"--bin=blockstack-core",
"--package=blockstack-core"
],
"filter": {
"name": "blockstack_lib",
"kind": "lib"
"name": "blockstack-core",
"kind": "bin"
}
},
"args": [],
Expand All @@ -26,39 +22,51 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'blockstack-core' testnet",
"name": "executable 'clarity-cli'",
"cargo": {
"args": [
"build",
"--bin=blockstack-core",
"--bin=clarity-cli",
"--package=blockstack-core"
],
"filter": {
"name": "blockstack-core",
"name": "clarity-cli",
"kind": "bin"
}
},
"args": [
"testnet",
"${workspaceFolder}/Stacks.toml"
],
"cwd": "${workspaceFolder}",
"env": {
"RUST_BACKTRACE": "full",
}
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'blockstack-core'",
"name": "executable 'blockstack-cli'",
"cargo": {
"args": [
"build",
"--bin=blockstack-core",
"--bin=blockstack-cli",
"--package=blockstack-core"
],
"filter": {
"name": "blockstack-core",
"name": "blockstack-cli",
"kind": "bin"
}
},
"args": ["generate-sk"],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "executable 'bitcoin-neon-controller'",
"cargo": {
"args": [
"build",
"--bin=bitcoin-neon-controller",
"--package=bitcoin-neon-controller"
],
"filter": {
"name": "bitcoin-neon-controller",
"kind": "bin"
}
},
Expand All @@ -68,17 +76,35 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'blockstack-core'",
"name": "executable 'stacks-node' -- mocknet",
"cargo": {
"args": [
"build",
"--bin=stacks-node",
"--package=stacks-node"
],
"filter": {
"name": "stacks-node",
"kind": "bin"
}
},
"args": ["mocknet"],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "unit tests in library 'blockstack_lib'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=blockstack-core",
"--lib",
"--package=blockstack-core"
],
"filter": {
"name": "blockstack-core",
"kind": "bin"
"name": "blockstack_lib",
"kind": "lib"
}
},
"args": [],
Expand All @@ -87,15 +113,16 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'clarity-cli'",
"name": "unit tests in executable 'blockstack-core'",
"cargo": {
"args": [
"build",
"--bin=clarity-cli",
"test",
"--no-run",
"--bin=blockstack-core",
"--package=blockstack-core"
],
"filter": {
"name": "clarity-cli",
"name": "blockstack-core",
"kind": "bin"
}
},
Expand All @@ -105,7 +132,7 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'clarity-cli'",
"name": "unit tests in executable 'clarity-cli'",
"cargo": {
"args": [
"test",
Expand All @@ -124,10 +151,11 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'blockstack-cli'",
"name": "unit tests in executable 'blockstack-cli'",
"cargo": {
"args": [
"build",
"test",
"--no-run",
"--bin=blockstack-cli",
"--package=blockstack-core"
],
Expand All @@ -142,21 +170,97 @@
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'blockstack-cli'",
"name": "unit tests in executable 'stacks-node'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=blockstack-cli",
"--package=blockstack-core"
"--bin=stacks-node",
"--package=stacks-node"
],
"filter": {
"name": "blockstack-cli",
"name": "stacks-node",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "unit tests in executable 'bitcoin-neon-controller'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=bitcoin-neon-controller",
"--package=bitcoin-neon-controller"
],
"filter": {
"name": "bitcoin-neon-controller",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "benchmark 'marf_bench'",
"cargo": {
"args": [
"test",
"--no-run",
"--bench=marf_bench",
"--package=blockstack-core"
],
"filter": {
"name": "marf_bench",
"kind": "bench"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "benchmark 'large_contract_bench'",
"cargo": {
"args": [
"test",
"--no-run",
"--bench=large_contract_bench",
"--package=blockstack-core"
],
"filter": {
"name": "large_contract_bench",
"kind": "bench"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "benchmark 'block_limits'",
"cargo": {
"args": [
"test",
"--no-run",
"--bench=block_limits",
"--package=blockstack-core"
],
"filter": {
"name": "block_limits",
"kind": "bench"
}
},
"args": [],
"cwd": "${workspaceFolder}"
}
]
}
Loading

0 comments on commit 1a34c15

Please sign in to comment.