btcpayserver/NBXplorer
btcpayserver/NBXplorer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove message broker leftover

Browse Source
This commit is contained in:
Nicolas Dorier 2026-04-10 09:09:44 +09:00
parent 802945291a
commit 68513b4668
No known key found for this signature in database
GPG Key ID: 6618763EF09186FE
7 changed files with 1 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
NBXplorer.Tests/ServerTester.cs
View File

@ -111,7 +111,6 @@ namespace NBXplorer.Tests
}
public int TrimEvents { get; set; } = -1;
public bool UseRabbitMQ { get; set; } = false;
public List<(string key, string value)> AdditionalConfiguration { get; set; } = new List<(string key, string value)>();
public List<string> AdditionalFlags = new List<string>();
internal string PostgresConnectionString;
@ -138,20 +137,6 @@ namespace NBXplorer.Tests
keyValues.Add(("mingapsize", "3"));
keyValues.Add(("maxgapsize", "8"));
keyValues.Add(($"{CryptoCode.ToLowerInvariant()}nodeendpoint", $"{Explorer.Endpoint.Address}:{Explorer.Endpoint.Port}"));
keyValues.Add(("asbcnstr", AzureServiceBusTestConfig.ConnectionString));
keyValues.Add(("asbblockq", AzureServiceBusTestConfig.NewBlockQueue));
keyValues.Add(("asbtranq", AzureServiceBusTestConfig.NewTransactionQueue));
keyValues.Add(("asbblockt", AzureServiceBusTestConfig.NewBlockTopic));
keyValues.Add(("asbtrant", AzureServiceBusTestConfig.NewTransactionTopic));
if (UseRabbitMQ)
{
keyValues.Add(("rmqhost", RabbitMqTestConfig.RabbitMqHostName));
keyValues.Add(("rmqvirtual", RabbitMqTestConfig.RabbitMqVirtualHost));
keyValues.Add(("rmquser", RabbitMqTestConfig.RabbitMqUsername));
keyValues.Add(("rmqpass", RabbitMqTestConfig.RabbitMqPassword));
keyValues.Add(("rmqtranex", RabbitMqTestConfig.RabbitMqTransactionExchange));
keyValues.Add(("rmqblockex", RabbitMqTestConfig.RabbitMqBlockExchange));
}
var args = keyValues.SelectMany(kv => new[] { $"--{kv.key}", kv.value })
.Concat(AdditionalFlags)
.Concat(additionalFlags).ToArray();

74
NBXplorer.Tests/TestConfig.cs
View File

@ -1,74 +0,0 @@
namespace NBXplorer.Tests
{
public static class RabbitMqTestConfig
{
//Put your rabbit mq settings here
public static string RabbitMqHostName => "localhost";
public static string RabbitMqVirtualHost => "/";
public static string RabbitMqUsername => "guest";
public static string RabbitMqPassword => "guest";
public static string RabbitMqBlockExchange => "NewBlock";
public static string RabbitMqTransactionExchange => "NewTransaction";
}
public static class AzureServiceBusTestConfig
{
public static string ConnectionString
{
get
{
//Put your service bus connection string here - requires READ / WRITE permissions
return "";
}
}
public static string NewBlockQueue
{
get
{
return "newblock";
}
}
public static string NewBlockTopic
{
get
{
return "newbitcoinblock";
}
}
public static string NewBlockSubscription
{
get
{
return "NewBlock";
}
}
public static string NewTransactionQueue
{
get
{
return "newtransaction";
}
}
public static string NewTransactionTopic
{
get
{
return "newbitcointransaction";
}
}
public static string NewTransactionSubscription
{
get
{
return "NewTransaction";
}
}
}
}

2
NBXplorer.Tests/tests-entrypoint.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh
set -e
dotnet test --filter "Azure!=Azure&Broker!=RabbitMq&Benchmark!=Benchmark&Maintenance!=Maintenance" --no-build -v n --logger "console;verbosity=normal" < /dev/null
dotnet test --filter "Benchmark!=Benchmark&Maintenance!=Maintenance" --no-build -v n --logger "console;verbosity=normal" < /dev/null

22
NBXplorer/Configuration/DefaultConfiguration.cs
View File

@ -43,19 +43,6 @@ namespace NBXplorer.Configuration
app.Option($"--{crypto}exposerpc", $"Expose the node RPCs through the REST API (default: false)", CommandOptionType.SingleValue);
}
app.Option("--asbcnstr", "[For Azure Service Bus] Azure Service Bus Connection string. New Block and New Transaction messages will be pushed to queues when this values is set", CommandOptionType.SingleValue);
app.Option("--asbblockq", "[For Azure Service Bus] Name of Queue to push new block message to. Leave blank to turn off", CommandOptionType.SingleValue);
app.Option("--asbtranq", "[For Azure Service Bus] Name of Queue to push new transaction message to. Leave blank to turn off", CommandOptionType.SingleValue);
app.Option("--asbblockt", "[For Azure Service Bus] Name of Topic to push new block message to. Leave blank to turn off", CommandOptionType.SingleValue);
app.Option("--asbtrant", "[For Azure Service Bus] Name of Topic to push new transaction message to. Leave blank to turn off", CommandOptionType.SingleValue);
app.Option("--rmqhost", "[For RabbitMq] RabbitMq host name. Leave blank to turn off", CommandOptionType.SingleValue);
app.Option("--rmquser", "[For RabbitMq] RabbitMq username. Leave blank to turn off", CommandOptionType.SingleValue);
app.Option("--rmqpass", "[For RabbitMq] RabbitMq password. Leave blank to turn off", CommandOptionType.SingleValue);
app.Option("--rmqvirtual", "[For RabbitMq] RabbitMq virtual host.", CommandOptionType.SingleValue);
app.Option("--rmqtranex", "[For RabbitMq] Name of exchange to push transaction messages.", CommandOptionType.SingleValue);
app.Option("--rmqblockex", "[For RabbitMq] Name of exchange to push block messages.", CommandOptionType.SingleValue);
app.Option("--customkeypathtemplate", $"Define an additional derivation path tracked by NBXplorer (Format: m/1/392/*/29, default: empty)", CommandOptionType.SingleValue);
app.Option("--maxgapsize", $"The maximum gap address count on which the explorer will track derivation schemes (default: 30)", CommandOptionType.SingleValue);
app.Option("--mingapsize", $"The minimum gap address count on which the explorer will track derivation schemes (default: 20)", CommandOptionType.SingleValue);
@ -179,15 +166,6 @@ namespace NBXplorer.Configuration
builder.AppendLine("#port=" + settings.DefaultPort);
builder.AppendLine("#bind=127.0.0.1");
builder.AppendLine($"#{networkType.ToString().ToLowerInvariant()}=1");
builder.AppendLine();
builder.AppendLine();
builder.AppendLine("####Azure Service Bus####");
builder.AppendLine("## Azure Service Bus configuration - set connection string to use Service Bus. Set Queue and / or Topic names to publish message to queues / topics");
builder.AppendLine("#asbcnstr=Endpoint=sb://<yourdomain>.servicebus.windows.net/;SharedAccessKeyName=<your key name here>;SharedAccessKey=<your key here>");
builder.AppendLine("#asbblockq=<new block queue name>");
builder.AppendLine("#asbtranq=<new transaction queue name>");
builder.AppendLine("#asbblockt=<new block topic name>");
builder.AppendLine("#asbtrant=<new transaction topic name>");
return builder.ToString();
}

48
NBXplorer/Configuration/ExplorerConfiguration.cs
View File

@ -187,19 +187,6 @@ namespace NBXplorer.Configuration
CustomKeyPathTemplate = v;
}
AzureServiceBusConnectionString = config.GetOrDefault<string>("asbcnstr", "");
AzureServiceBusBlockQueue = config.GetOrDefault<string>("asbblockq", "");
AzureServiceBusTransactionQueue = config.GetOrDefault<string>("asbtranq", "");
AzureServiceBusBlockTopic = config.GetOrDefault<string>("asbblockt", "");
AzureServiceBusTransactionTopic = config.GetOrDefault<string>("asbtrant", "");
RabbitMqHostName = config.GetOrDefault<string>("rmqhost", "");
RabbitMqVirtualHost = config.GetOrDefault<string>("rmqvirtual", "");
RabbitMqUsername = config.GetOrDefault<string>("rmquser", "");
RabbitMqPassword = config.GetOrDefault<string>("rmqpass", "");
RabbitMqTransactionExchange = config.GetOrDefault<string>("rmqtranex", "");
RabbitMqBlockExchange = config.GetOrDefault<string>("rmqblockex", "");
var obsolete = string.Join(", ",
new[] { "dbtrie", "automigrate", "nomigrateevts", "nomigraterawtxs", "cachechain", "deleteaftermigration", "dbcache" }
.Where(o => !string.IsNullOrEmpty(config[o])));
@ -239,41 +226,6 @@ namespace NBXplorer.Configuration
set;
}
public int TrimEvents { get; set; }
public string AzureServiceBusConnectionString
{
get;
set;
}
public string AzureServiceBusBlockQueue
{
get;
set;
}
public string AzureServiceBusBlockTopic
{
get;
set;
}
public string AzureServiceBusTransactionQueue
{
get;
set;
}
public string AzureServiceBusTransactionTopic
{
get;
set;
}
public string RabbitMqHostName { get; set; }
public string RabbitMqVirtualHost { get; set; }
public string RabbitMqUsername { get; set; }
public string RabbitMqPassword { get; set; }
public string RabbitMqTransactionExchange { get; set; }
public string RabbitMqBlockExchange { get; set; }
public KeyPathTemplate CustomKeyPathTemplate { get; set; }
public EndPoint SocksEndpoint { get; set; }

9
docker-compose.mutiny.yml
View File

@ -27,15 +27,6 @@ services:
- "39388:39388"
volumes:
- "bitcoin_datadir:/data"
rabbitmq:
image: rabbitmq:3-management
hostname: rabbitmq
ports:
- 4369:4369
- 5671:5671
- 5672:5672
- 15672:15672
postgres:
image: postgres:18.1

16
docker-compose.regtest.yml
View File

@ -14,12 +14,6 @@ services:
NBXPLORER_CHAINS: "btc,lbtc"
NBXPLORER_BTCRPCURL: http://bitcoind:43782/
NBXPLORER_BTCNODEENDPOINT: bitcoind:39388
NBXPLORER_RMQHOST: rabbitmq
NBXPLORER_RMQVIRTUAL: /
NBXPLORER_RMQUSER: guest
NBXPLORER_RMQPASS: guest
NBXPLORER_RMQTRANEX: NewTransaction
NBXPLORER_RMQBLOCKEX: NewBlock
NBXPLORER_LBTCRPCURL: http://elementsd-liquid:43783/
NBXPLORER_LBTCNODEENDPOINT: elementsd-liquid:39389
volumes:
@ -28,7 +22,6 @@ services:
- "elementsd_liquid_datadir:/root/.elements"
links:
- bitcoind
- rabbitmq
bitcoind:
restart: always
@ -50,15 +43,6 @@ services:
- "39388:39388"
volumes:
- "bitcoin_datadir:/data"
rabbitmq:
image: rabbitmq:3-management
hostname: rabbitmq
ports:
- 4369:4369
- 5671:5671
- 5672:5672
- 15672:15672
elementsd-liquid:
restart: always