Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct method, parameter, variable names (MemPool to Mempool) #1772

Merged
merged 6 commits into from Jul 7, 2019
Merged

Correct method, parameter, variable names (MemPool to Mempool) #1772

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5b2927
Correct method, parameter, variable names (MemPool to Mempool)
yahiheb Jul 5, 2019
3029730
Merge branch 'master' into mempool
yahiheb Jul 5, 2019
83ac8a2
Merge branch 'master' into mempool
yahiheb Jul 6, 2019
0664b9d
Merge branch 'master' into mempool
nopara73 Jul 7, 2019
345e38f
fix build error
nopara73 Jul 7, 2019
d00c258
Rename filenames
nopara73 Jul 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions WalletWasabi.Gui/Controls/WalletExplorer/HistoryTabViewModel.cs
View file
Open in desktop
Expand Up @@ -167,7 +167,7 @@ private List<(DateTimeOffset dateTime, Height height, Money amount, string label
}
else
{
dateTime = foundTransaction.FirstSeenIfMemPoolTime ?? DateTimeOffset.UtcNow;
dateTime = foundTransaction.FirstSeenIfMempoolTime ?? DateTimeOffset.UtcNow;
}
if (found != default) // if found
{
Expand Down Expand Up @@ -211,7 +211,7 @@ private List<(DateTimeOffset dateTime, Height height, Money amount, string label
}
else
{
dateTime = foundSpenderTransaction.FirstSeenIfMemPoolTime ?? DateTimeOffset.UtcNow;
dateTime = foundSpenderTransaction.FirstSeenIfMempoolTime ?? DateTimeOffset.UtcNow;
}

var foundSpenderCoin = txRecordList.FirstOrDefault(x => x.transactionId == coin.SpenderTransactionId);
Expand Down
2 changes: 1 addition & 1 deletion WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
View file
Open in desktop
Expand Up @@ -358,7 +358,7 @@ public SendTabViewModel(WalletViewModel walletViewModel, bool isTransactionBuild
IsHardwareBusy = false;
}

signedTransaction = signedPsbt.ExtractSmartTransaction(result.Transaction.Height, result.Transaction.BlockHash, result.Transaction.BlockIndex, result.Transaction.Label, result.Transaction.FirstSeenIfMemPoolTime, result.Transaction.IsReplacement);
signedTransaction = signedPsbt.ExtractSmartTransaction(result.Transaction.Height, result.Transaction.BlockHash, result.Transaction.BlockIndex, result.Transaction.Label, result.Transaction.FirstSeenIfMempoolTime, result.Transaction.IsReplacement);
}

MainWindowViewModel.Instance.StatusBar.TryAddStatus(StatusBarStatus.BroadcastingTransaction);
Expand Down
26 changes: 13 additions & 13 deletions WalletWasabi.Gui/Global.cs
View file
Open in desktop
Expand Up @@ -50,13 +50,13 @@ public class Global

public string AddressManagerFilePath { get; private set; }
public AddressManager AddressManager { get; private set; }
public MemPoolService MemPoolService { get; private set; }
public MempoolService MempoolService { get; private set; }

public NodesGroup Nodes { get; private set; }
public WasabiSynchronizer Synchronizer { get; private set; }
public CcjClient ChaumianClient { get; private set; }
public WalletService WalletService { get; private set; }
public Node RegTestMemPoolServingNode { get; private set; }
public Node RegTestMempoolServingNode { get; private set; }
public UpdateChecker UpdateChecker { get; private set; }
public TorProcessManager TorManager { get; private set; }

Expand Down Expand Up @@ -206,8 +206,8 @@ public async Task InitializeNoWalletAsync()

#region MempoolInitialization

MemPoolService = new MemPoolService();
connectionParameters.TemplateBehaviors.Add(new MemPoolBehavior(MemPoolService));
MempoolService = new MempoolService();
connectionParameters.TemplateBehaviors.Add(new MempoolBehavior(MempoolService));

#endregion MempoolInitialization

Expand Down Expand Up @@ -247,9 +247,9 @@ public async Task InitializeNoWalletAsync()
Node node = await Node.ConnectAsync(Network.RegTest, new IPEndPoint(IPAddress.Loopback, 18444));
Nodes.ConnectedNodes.Add(node);

RegTestMemPoolServingNode = await Node.ConnectAsync(Network.RegTest, new IPEndPoint(IPAddress.Loopback, 18444));
RegTestMempoolServingNode = await Node.ConnectAsync(Network.RegTest, new IPEndPoint(IPAddress.Loopback, 18444));

RegTestMemPoolServingNode.Behaviors.Add(new MemPoolBehavior(MemPoolService));
RegTestMempoolServingNode.Behaviors.Add(new MempoolBehavior(MempoolService));
}
catch (SocketException ex)
{
Expand All @@ -270,15 +270,15 @@ public async Task InitializeNoWalletAsync()
}
Nodes = new NodesGroup(Network, connectionParameters, requirements: Constants.NodeRequirements);

RegTestMemPoolServingNode = null;
RegTestMempoolServingNode = null;
}

Nodes.Connect();
Logger.LogInfo("Start connecting to nodes...");

if (RegTestMemPoolServingNode != null)
if (RegTestMempoolServingNode != null)
{
RegTestMemPoolServingNode.VersionHandshake();
RegTestMempoolServingNode.VersionHandshake();
Logger.LogInfo("Start connecting to mempool serving regtest node...");
}

Expand Down Expand Up @@ -425,7 +425,7 @@ public async Task InitializeWalletServiceAsync(KeyManager keyManager)
Logger.LogWarning(ex, nameof(Global));
}

WalletService = new WalletService(BitcoinStore, keyManager, Synchronizer, ChaumianClient, MemPoolService, Nodes, DataDir, Config.ServiceConfiguration);
WalletService = new WalletService(BitcoinStore, keyManager, Synchronizer, ChaumianClient, MempoolService, Nodes, DataDir, Config.ServiceConfiguration);

ChaumianClient.Start();
Logger.LogInfo("Start Chaumian CoinJoin service...");
Expand Down Expand Up @@ -635,10 +635,10 @@ public async Task DisposeAsync()
Logger.LogInfo($"{nameof(Nodes)} are disposed.", nameof(Global));
}

if (RegTestMemPoolServingNode != null)
if (RegTestMempoolServingNode != null)
{
RegTestMemPoolServingNode.Disconnect();
Logger.LogInfo($"{nameof(RegTestMemPoolServingNode)} is disposed.", nameof(Global));
RegTestMempoolServingNode.Disconnect();
Logger.LogInfo($"{nameof(RegTestMempoolServingNode)} is disposed.", nameof(Global));
}

if (TorManager != null)
Expand Down
8 changes: 4 additions & 4 deletions WalletWasabi.Tests/ModelTests.cs
View file
Open in desktop
Expand Up @@ -29,7 +29,7 @@ public void SmartTransactionEquality()
var tx = Transaction.Parse(hex, Network.TestNet);
var tx2 = Transaction.Parse(hex, Network.Main);
var tx3 = Transaction.Parse(hex, Network.RegTest);
var height = Height.MemPool;
var height = Height.Mempool;

var smartTx = new SmartTransaction(tx, height);
var differentSmartTx = new SmartTransaction(Network.TestNet.Consensus.ConsensusFactory.CreateTransaction(), height);
Expand All @@ -56,7 +56,7 @@ public void SmartCoinEquality()
var amount = output.Value;
var spentOutputs = tx.Inputs.ToTxoRefs().ToArray();

var height = Height.MemPool;
var height = Height.Mempool;
var label = "foo";

var coin = new SmartCoin(txId, index, scriptPubKey, amount, spentOutputs, height, tx.RBF, tx.GetAnonymitySet(index), label, txId);
Expand All @@ -80,7 +80,7 @@ public void SmartTransactionSerialization()
var tx = Transaction.Parse("02000000040aa8d0af84518df6e3a60c5bb19d9c3fcc3dc6e26b2f2449e8d7bf8d3fe84b87010000006a473044022018dfe9216c1209dd6c2b6c1607dbac4e499c1fce4878bc7d5d83fccbf3e24c9402202cac351c9c6a2b5eef338cbf0ec000d8de1c05e96a904cbba2b9e6ffc2d4e19501210364cc39da1091b1a9c12ec905a14a9e8478f951f7a1accdabeb40180533f2eaa5feffffff112c07d0f5e0617d720534f0b2b84dc0d5b7314b358c3ab338823b9e5bfbddf5010000006b483045022100ec155e7141e74661ee511ae980150a6c89261f31070999858738369afc28f2b6022006230d2aa24fac110b74ef15b84371486cf76c539b335a253c14462447912a300121020c2f41390f031d471b22abdb856e6cdbe0f4d74e72c197469bfd54e5a08f7e67feffffff38e799b8f6cf04fd021a9b135cdcd347da7aac4fd8bb8d0da9316a9fb228bb6e000000006b483045022100fc1944544a3f96edd8c8a9795c691e2725612b5ab2e1c999be11a2a4e3f841f1022077b2e088877829edeada0c707a9bb577aa79f26dafacba3d1d2d047f52524296012102e6015963dff9826836400cf8f45597c0705757d5dcdc6bf734f661c7dab89e69feffffff64c3f0377e86625123f2f1ee229319ed238e8ca8b7dda5bc080a2c5ecb984629000000006a47304402204233a90d6296182914424fd2901e16e6f5b13b451b67b0eec25a5eaacc5033c902203d8a13ef0b494c12009663475458e51da6bd55cc67688264230ece81d3eeca24012102f806d7152da2b52c1d9ad928e4a6253ccba080a5b9ab9efdd80e37274ac67f9bfeffffff0290406900000000001976a91491ac4e49b66f845180d98d8f8be6121588be6e3b88ac52371600000000001976a9142f44ed6749e8c84fd476e4440741f7e6f55542fa88acadd30700", Network.TestNet);
var tx2 = Transaction.Parse("02000000040aa8d0af84518df6e3a60c5bb19d9c3fcc3dc6e26b2f2449e8d7bf8d3fe84b87010000006a473044022018dfe9216c1209dd6c2b6c1607dbac4e499c1fce4878bc7d5d83fccbf3e24c9402202cac351c9c6a2b5eef338cbf0ec000d8de1c05e96a904cbba2b9e6ffc2d4e19501210364cc39da1091b1a9c12ec905a14a9e8478f951f7a1accdabeb40180533f2eaa5feffffff112c07d0f5e0617d720534f0b2b84dc0d5b7314b358c3ab338823b9e5bfbddf5010000006b483045022100ec155e7141e74661ee511ae980150a6c89261f31070999858738369afc28f2b6022006230d2aa24fac110b74ef15b84371486cf76c539b335a253c14462447912a300121020c2f41390f031d471b22abdb856e6cdbe0f4d74e72c197469bfd54e5a08f7e67feffffff38e799b8f6cf04fd021a9b135cdcd347da7aac4fd8bb8d0da9316a9fb228bb6e000000006b483045022100fc1944544a3f96edd8c8a9795c691e2725612b5ab2e1c999be11a2a4e3f841f1022077b2e088877829edeada0c707a9bb577aa79f26dafacba3d1d2d047f52524296012102e6015963dff9826836400cf8f45597c0705757d5dcdc6bf734f661c7dab89e69feffffff64c3f0377e86625123f2f1ee229319ed238e8ca8b7dda5bc080a2c5ecb984629000000006a47304402204233a90d6296182914424fd2901e16e6f5b13b451b67b0eec25a5eaacc5033c902203d8a13ef0b494c12009663475458e51da6bd55cc67688264230ece81d3eeca24012102f806d7152da2b52c1d9ad928e4a6253ccba080a5b9ab9efdd80e37274ac67f9bfeffffff0290406900000000001976a91491ac4e49b66f845180d98d8f8be6121588be6e3b88ac52371600000000001976a9142f44ed6749e8c84fd476e4440741f7e6f55542fa88acadd30700", Network.Main);
var tx3 = Transaction.Parse("02000000040aa8d0af84518df6e3a60c5bb19d9c3fcc3dc6e26b2f2449e8d7bf8d3fe84b87010000006a473044022018dfe9216c1209dd6c2b6c1607dbac4e499c1fce4878bc7d5d83fccbf3e24c9402202cac351c9c6a2b5eef338cbf0ec000d8de1c05e96a904cbba2b9e6ffc2d4e19501210364cc39da1091b1a9c12ec905a14a9e8478f951f7a1accdabeb40180533f2eaa5feffffff112c07d0f5e0617d720534f0b2b84dc0d5b7314b358c3ab338823b9e5bfbddf5010000006b483045022100ec155e7141e74661ee511ae980150a6c89261f31070999858738369afc28f2b6022006230d2aa24fac110b74ef15b84371486cf76c539b335a253c14462447912a300121020c2f41390f031d471b22abdb856e6cdbe0f4d74e72c197469bfd54e5a08f7e67feffffff38e799b8f6cf04fd021a9b135cdcd347da7aac4fd8bb8d0da9316a9fb228bb6e000000006b483045022100fc1944544a3f96edd8c8a9795c691e2725612b5ab2e1c999be11a2a4e3f841f1022077b2e088877829edeada0c707a9bb577aa79f26dafacba3d1d2d047f52524296012102e6015963dff9826836400cf8f45597c0705757d5dcdc6bf734f661c7dab89e69feffffff64c3f0377e86625123f2f1ee229319ed238e8ca8b7dda5bc080a2c5ecb984629000000006a47304402204233a90d6296182914424fd2901e16e6f5b13b451b67b0eec25a5eaacc5033c902203d8a13ef0b494c12009663475458e51da6bd55cc67688264230ece81d3eeca24012102f806d7152da2b52c1d9ad928e4a6253ccba080a5b9ab9efdd80e37274ac67f9bfeffffff0290406900000000001976a91491ac4e49b66f845180d98d8f8be6121588be6e3b88ac52371600000000001976a9142f44ed6749e8c84fd476e4440741f7e6f55542fa88acadd30700", Network.RegTest);
var height = Height.MemPool;
var height = Height.Mempool;

string label = "foo";
var smartTx = new SmartTransaction(tx, height, label: label);
Expand Down Expand Up @@ -149,7 +149,7 @@ public void SmartCoinSerialization()
var scriptPubKey = output.ScriptPubKey;
var amount = output.Value;
var spentOutputs = tx.Inputs.ToTxoRefs().ToArray();
var height = Height.MemPool;
var height = Height.Mempool;
var label = "foo";
var bannedUntil = DateTimeOffset.UtcNow;

Expand Down
14 changes: 7 additions & 7 deletions WalletWasabi.Tests/P2pTests.cs
View file
Open in desktop
Expand Up @@ -79,8 +79,8 @@ public async Task TestServicesAsync(string networkString)
}

connectionParameters.TemplateBehaviors.Add(new AddressManagerBehavior(addressManager));
var memPoolService = new MemPoolService();
connectionParameters.TemplateBehaviors.Add(new MemPoolBehavior(memPoolService));
var mempoolService = new MempoolService();
connectionParameters.TemplateBehaviors.Add(new MempoolBehavior(mempoolService));

var nodes = new NodesGroup(network, connectionParameters, requirements: Constants.NodeRequirements);

Expand All @@ -94,15 +94,15 @@ public async Task TestServicesAsync(string networkString)
keyManager,
syncer,
new CcjClient(syncer, network, keyManager, new Uri("http://localhost:12345"), Global.Instance.TorSocks5Endpoint),
memPoolService,
mempoolService,
nodes,
Global.Instance.DataDir,
new ServiceConfiguration(50, 2, 21, 50, new IPEndPoint(IPAddress.Loopback, network.DefaultPort), Money.Coins(0.0001m)));
Assert.True(Directory.Exists(blocksFolderPath));

try
{
memPoolService.TransactionReceived += MemPoolService_TransactionReceived;
mempoolService.TransactionReceived += MempoolService_TransactionReceived;

nodes.Connect();
var times = 0;
Expand All @@ -121,7 +121,7 @@ public async Task TestServicesAsync(string networkString)
{
if (times > 3000) // 3 minutes
{
throw new TimeoutException($"{nameof(MemPoolService)} test timed out.");
throw new TimeoutException($"{nameof(MempoolService)} test timed out.");
}
await Task.Delay(100);
times++;
Expand All @@ -141,7 +141,7 @@ public async Task TestServicesAsync(string networkString)
{
nodes.ConnectedNodes.Added -= ConnectedNodes_Added;
nodes.ConnectedNodes.Removed -= ConnectedNodes_Removed;
memPoolService.TransactionReceived -= MemPoolService_TransactionReceived;
mempoolService.TransactionReceived -= MempoolService_TransactionReceived;

// So next test will download the block.
foreach (var hash in blocksToDownload)
Expand Down Expand Up @@ -189,7 +189,7 @@ private void ConnectedNodes_Removed(object sender, NodeEventArgs e)

private long _mempoolTransactionCount = 0;

private void MemPoolService_TransactionReceived(object sender, SmartTransaction e)
private void MempoolService_TransactionReceived(object sender, SmartTransaction e)
{
Interlocked.Increment(ref _mempoolTransactionCount);
Logger.LogDebug<P2pTests>($"Mempool transaction received: {e.GetHash()}.");
Expand Down