aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-02-02 04:44:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to work with 0.16.0

Browse Source
This commit is contained in:
nicolas.dorier
2018-02-28 17:01:10 +09:00
parent 061f428a54
commit 2d5a861df0
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
BTCPayServer.Tests/ServerTester.cs
View File

@@ -93,11 +93,6 @@ namespace BTCPayServer.Tests
var clightning = new NodeInfo(info.Id, MerchantCharge.P2PHost, info.Port);
var connect = CustomerEclair.RPC.ConnectAsync(clightning);
await Task.WhenAll(blockCount, customer, channels, connect);
// Mine until segwit is activated
if (blockCount.Result <= 432)
{
ExplorerNode.Generate(433 - blockCount.Result);
}
// If the channel is not created, let's do it
if (channels.Result.Length == 0)

8
BTCPayServer.Tests/docker-compose.yml
View File

@@ -28,7 +28,7 @@ services:
# The dev container is not actually used, it is just handy to run `docker-compose up dev` to start all services
dev:
image: nicolasdorier/docker-bitcoin:0.15.0.1
image: nicolasdorier/docker-bitcoin:0.16.0
environment:
BITCOIN_EXTRA_ARGS: |
regtest=1
@@ -40,7 +40,7 @@ services:
- lightning-charged
nbxplorer:
image: nicolasdorier/nbxplorer:1.0.1.14
image: nicolasdorier/nbxplorer:1.0.1.16
ports:
- "32838:32838"
expose:
@@ -65,7 +65,7 @@ services:
bitcoind:
container_name: btcpayserver_dev_bitcoind
image: nicolasdorier/docker-bitcoin:0.15.0.1
image: nicolasdorier/docker-bitcoin:0.16.0
environment:
BITCOIN_EXTRA_ARGS: |
rpcuser=ceiwHEbqWI83
@@ -78,6 +78,8 @@ services:
zmqpubrawblock=tcp://0.0.0.0:29000
zmqpubrawtx=tcp://0.0.0.0:29000
txindex=1
# Eclair is still using addwitnessaddress
deprecatedrpc=addwitnessaddress
ports:
- "43782:43782"
expose: