Skip to content

Commit 54c3cf3

Browse files
committed
pulls, move things to current.
1 parent 2a1d5a8 commit 54c3cf3

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

LNUnit.Tests/AbcLightningFixtureBoltDb.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
namespace LNUnit.Tests;
1515

16-
[Ignore("only local")]
17-
[TestFixture("boltdb", "custom_lnd", "latest", "/home/lnd/.lnd", false)]
18-
// [TestFixture("boltdb", "lightninglabs/lnd", "v0.17.5-beta", "/root/.lnd", false)]
16+
//[Ignore("only local")]
17+
//[TestFixture("boltdb", "custom_lnd", "latest", "/home/lnd/.lnd", false)]
18+
[TestFixture("boltdb", "lightninglabs/lnd", "v0.19.3-beta", "/root/.lnd", true)]
1919
public class AbcLightningAbstractTestsBoltDb : LNUnit.Tests.Abstract.AbcLightningAbstractTests
2020
{
2121
public AbcLightningAbstractTestsBoltDb(string dbType = "boltdb",

LNUnit.Tests/AbcLightningFixturePostgres.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace LNUnit.Tests.Fixture;
44

5-
//Ignore("only local")]
5+
[Ignore("only local")]
66
//[TestFixture("postgres", "lightninglabs/lnd", "v0.18.3-beta", "/root/.lnd", true)]
77
[TestFixture("postgres", "custom_lnd", "latest", "/home/lnd/.lnd", false)]
88
public class AbcLightningAbstractTestsPostgres : LNUnit.Tests.Abstract.AbcLightningAbstractTests

LNUnit.Tests/Abstract/AbcLightningAbstractTests.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ public async Task OneTimeSetup()
7979
PostgresFixture.AddDb("carol");
8080
}
8181

82-
await _client.CreateDockerImageFromPath("../../../../Docker/lnd", ["custom_lnd", "custom_lnd:latest"]);
83-
await _client.CreateDockerImageFromPath("./../../../../Docker/bitcoin/29.0", ["bitcoin:latest", "bitcoin:29.0"]);
82+
// await _client.CreateDockerImageFromPath("../../../../Docker/lnd", ["custom_lnd", "custom_lnd:latest"]);
83+
// await _client.CreateDockerImageFromPath("./../../../../Docker/bitcoin/29.0", ["bitcoin:latest", "bitcoin:29.0"]);
8484
await SetupNetwork(_lndImage, _tag, _lndRoot, _pullImage);
8585
}
8686

@@ -110,7 +110,7 @@ public void Dispose()
110110

111111

112112
public async Task SetupNetwork(string lndImage = "lightninglabs/lnd", string lndTag = "daily-testing-only",
113-
string lndRoot = "/root/.lnd", bool pullLndImage = false, string bitcoinImage = "bitcoin", string bitcoinTag = "29.0",
113+
string lndRoot = "/root/.lnd", bool pullLndImage = false, string bitcoinImage = "polarlightning/bitcoind", string bitcoinTag = "29.0",
114114
bool pullBitcoinImage = false)
115115
{
116116
await _client.RemoveContainer("miner");
@@ -120,7 +120,11 @@ public async Task SetupNetwork(string lndImage = "lightninglabs/lnd", string lnd
120120

121121
Builder.AddBitcoinCoreNode(image: bitcoinImage, tag: bitcoinTag, pullImage: pullBitcoinImage);
122122

123-
if (pullLndImage) await _client.PullImageAndWaitForCompleted(lndImage, lndTag);
123+
if (pullLndImage)
124+
{
125+
await _client.PullImageAndWaitForCompleted(lndImage, lndTag);
126+
await _client.PullImageAndWaitForCompleted(bitcoinImage, bitcoinTag);
127+
}
124128

125129

126130
Builder.AddPolarLNDNode("alice",

LNUnit/Setup/LNUnitBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,7 +900,7 @@ public static class LNUnitBuilderExtensions
900900

901901

902902
public static LNUnitBuilder AddBitcoinCoreNode(this LNUnitBuilder b, string name = "miner",
903-
string image = "polarlightning/bitcoind", string tag = "27.0", bool txIndex = true, bool pullImage = true)
903+
string image = "polarlightning/bitcoind", string tag = "29.0", bool txIndex = true, bool pullImage = true)
904904
{
905905
return b.AddBitcoinCoreNode(new LNUnitNetworkDefinition.BitcoinNode
906906
{

0 commit comments

Comments
 (0)