Skip to content

Commit 26cbc37

Browse files
committed
minor improvements
1 parent b40c8bd commit 26cbc37

File tree

3 files changed

+8
-14
lines changed

3 files changed

+8
-14
lines changed

IxianDLT/Block/BlockProcessor.cs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,11 +1959,6 @@ public bool freezeSignatures(Block target_block)
19591959
var address = sig.recipientPubKeyOrAddress;
19601960
if (frozen_block_sigs.Find(x => x.recipientPubKeyOrAddress.addressNoChecksum.SequenceEqual(address.addressNoChecksum)) == null)
19611961
{
1962-
if (Clock.getNetworkTimestamp() - Node.blockChain.getLastBlock().timestamp < CoreConfig.blockSignaturePlCheckTimeout
1963-
&& PresenceList.getPresenceByAddress(address) == null)
1964-
{
1965-
continue;
1966-
}
19671962
frozen_block_sigs.Add(sig);
19681963
sig_count++;
19691964
}

IxianDLT/Meta/Config.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private static string outputHelp()
171171

172172
Console.WriteLine("Starts a new instance of Ixian DLT Node");
173173
Console.WriteLine("");
174-
Console.WriteLine(" IxianDLT.exe [-h] [-v] [-t] [-s] [-x] [-c] [-p 10234] [-a 8081] [-i ip] [-w ixian.wal] [-n seed1.ixian.io:10234]");
174+
Console.WriteLine(" IxianDLT.exe [-h] [-v] [-t] [-x] [-c] [-p 10234] [-a 8081] [-i ip] [-w ixian.wal] [-n seed1.ixian.io:10234]");
175175
Console.WriteLine(" [--worker] [--threads 1] [--config ixian.cfg] [--maxLogSize 50] [--maxLogCount 10] [--logVerbosity 14]");
176176
Console.WriteLine(" [--lastGoodBlock 110234] [--disableWebStart] [--onlyShowAddresses] [--walletPassword] [--blockStorage SQLite]");
177177
Console.WriteLine(" [--maxTxPerBlock 19980] [--disableSetTitle] [--disableFastBlockLoading] [--checksumLock Ixian] [--verboseOutput]");
@@ -183,7 +183,6 @@ private static string outputHelp()
183183
Console.WriteLine(" -h\t\t\t\t Displays this help");
184184
Console.WriteLine(" -v\t\t\t\t Displays version");
185185
Console.WriteLine(" -t\t\t\t\t Starts node in testnet mode");
186-
Console.WriteLine(" -s\t\t\t\t Saves full history");
187186
Console.WriteLine(" -x\t\t\t\t Change password of an existing wallet");
188187
Console.WriteLine(" -c\t\t\t\t Removes blockchain, walletstate, peers.dat, logs and other files before starting");
189188
Console.WriteLine(" -p\t\t\t\t Port to listen on");
@@ -525,18 +524,15 @@ private static void processCliParmeters(string[] args)
525524
// version
526525
cmd_parser.Setup<bool>('v', "version").Callback(text => outputVersion());
527526

528-
// Toggle between full history node and no history
529-
cmd_parser.Setup<bool>('s', "save-history").Callback(value => storeFullHistory = value).Required();
530-
531527
// Check for password change
532-
cmd_parser.Setup<bool>('x', "changepass").Callback(value => changePass = value).Required();
528+
cmd_parser.Setup<bool>('x', "changePass").Callback(value => changePass = value).Required();
533529

534530
// Check for recovery parameter
535531
cmd_parser.Setup<bool>("recover").Callback(value => recoverFromFile = value).Required();
536532

537533
cmd_parser.Setup<int>('p', "port").Callback(value => Config.serverPort = value).Required();
538534

539-
cmd_parser.Setup<int>('a', "apiport").Callback(value => apiPort = value).Required();
535+
cmd_parser.Setup<int>('a', "apiPort").Callback(value => apiPort = value).Required();
540536

541537
cmd_parser.Setup<string>('i', "ip").Callback(value => externalIp = value).Required();
542538

IxianDLT/Network/NetworkProtocol.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public static void parseProtocolMessage(ProtocolMessageCode code, byte[] data, R
198198
}
199199
catch (Exception e)
200200
{
201-
Logging.error("Error parsing network message. Details: {0}", e.ToString());
201+
Logging.error("Error parsing network message. Details: {0}", e);
202202
}
203203
}
204204

@@ -238,7 +238,10 @@ public static void handleHello(byte[] data, RemoteEndpoint endpoint)
238238
{
239239
using (BinaryReader reader = new BinaryReader(m))
240240
{
241-
CoreProtocolMessage.processHelloMessageV6(endpoint, reader);
241+
if (!CoreProtocolMessage.processHelloMessageV6(endpoint, reader))
242+
{
243+
return;
244+
}
242245

243246
char node_type = endpoint.presenceAddress.type;
244247
if (node_type == 'M'

0 commit comments

Comments
 (0)