Merge pull request #52 from make-software/use-tolowerinvariant

mrkara · web-flow · commit 74b785910acb · 2024-02-16T00:04:38.000+03:00
Use `ToLowerInvariant()` to avoid CultureInfo issues
diff --git a/Casper.Network.SDK.Test/NctlContractTest.cs b/Casper.Network.SDK.Test/NctlContractTest.cs
@@ -33,7 +33,7 @@ public async Task DeployContractTest()
                 50_000_000_000,
                 _chainName,
                 1, //gasPrice=1
-                45011500); //ttl='12h 30m 11s 500ms'
+                3_600_000*2); //ttl='2h'
             deploy.Sign(_faucetKey);
 
             var putResponse = await _client.PutDeploy(deploy);
@@ -92,7 +92,7 @@ public async Task CallContractByNameTest()
                 150_000_000,
                 _chainName,
                 1, //gasPrice=1
-                18*3_600_000); //ttl='18h'
+                2*3_600_000); //ttl='2h'
             deploy.Sign(_faucetKey);
 
             var putResponse = await _client.PutDeploy(deploy);
diff --git a/Casper.Network.SDK.Test/NctlSpeculativeExecutionTest.cs b/Casper.Network.SDK.Test/NctlSpeculativeExecutionTest.cs
@@ -48,7 +48,7 @@ public async Task SpeculativeExecutionTest()
                 50_000_000_000,
                 _chainName,
                 1, //gasPrice=1
-                45011500); //ttl='12h 30m 11s 500ms'
+                3_600_000*2); //ttl='2h'
             deploy.Sign(_faucetKey);
 
             var rpcResponse = await _client.SpeceulativeExecution(deploy);
diff --git a/Casper.Network.SDK/SSE/ServerEventsClient.cs b/Casper.Network.SDK/SSE/ServerEventsClient.cs
@@ -276,7 +276,7 @@ private Task ListenChannelAsync(ChannelType channelType, int? startFrom, Cancell
                     try
                     {
                         var uriBuilder = new UriBuilder(new Uri(client.BaseAddress +
-                            $"events/{channelType.ToString().ToLower()}"));
+                            $"events/{channelType.ToString().ToLowerInvariant()}"));
 
                         if (startFrom != null && startFrom != int.MaxValue)
                             uriBuilder.Query = $"start_from={startFrom}";
diff --git a/Casper.Network.SDK/Types/Delegator.cs b/Casper.Network.SDK/Types/Delegator.cs
@@ -67,10 +67,10 @@ public override Delegator Read(
                 
                 while (reader.TokenType == JsonTokenType.PropertyName)
                 {
-                    var property = reader.GetString();
+                    var property = reader.GetString()?.ToLowerInvariant();
                     reader.Read();
                     
-                    switch (property.ToLower())
+                    switch (property)
                     {
                         case "delegator_public_key":
                         case "public_key":
diff --git a/Casper.Network.SDK/Types/EntryPoint.cs b/Casper.Network.SDK/Types/EntryPoint.cs
@@ -32,7 +32,7 @@ public override EntryPointAccess Read(
                 if (reader.TokenType == JsonTokenType.String)
                 {
                     var value = reader.GetString();
-                    if (value.ToLower() == "public")
+                    if (value.ToLowerInvariant() == "public")
                         return new EntryPointAccess()
                         {
                             IsPublic = true,
@@ -44,7 +44,7 @@ public override EntryPointAccess Read(
                     reader.Read(); // start object
                     var value = reader.GetString(); // read property
                     reader.Read();
-                    if (value.ToLower() == "groups")
+                    if (value.ToLowerInvariant() == "groups")
                     {
                         List<string> groups = JsonSerializer.Deserialize<List<string>>(ref reader, options);
                         reader.Read(); // end array
diff --git a/Casper.Network.SDK/Types/ExecutionResult.cs b/Casper.Network.SDK/Types/ExecutionResult.cs
@@ -70,7 +70,7 @@ public override ExecutionResult Read(
                     var property = reader.GetString();
                     reader.Read();
 
-                    switch (property.ToLower())
+                    switch (property.ToLowerInvariant())
                     {
                         case "block_hash":
                             blockHash = reader.GetString();
diff --git a/Casper.Network.SDK/Types/PublicKey.cs b/Casper.Network.SDK/Types/PublicKey.cs
@@ -168,7 +168,7 @@ public void WriteToPem(string filePath)
         public string GetAccountHash()
         {
             var bcBl2bdigest = new Org.BouncyCastle.Crypto.Digests.Blake2bDigest(256);
-            string algo = KeyAlgorithm.ToString().ToLower();
+            string algo = KeyAlgorithm.ToString().ToLowerInvariant();
             bcBl2bdigest.BlockUpdate(System.Text.Encoding.UTF8.GetBytes(algo), 0, algo.Length);
             bcBl2bdigest.Update(0x00);
             bcBl2bdigest.BlockUpdate(RawBytes, 0, RawBytes.Length);
diff --git a/Casper.Network.SDK/Types/SeigniorageAllocation.cs b/Casper.Network.SDK/Types/SeigniorageAllocation.cs
@@ -74,7 +74,7 @@ public override SeigniorageAllocation Read(
 
                 return new SeigniorageAllocation()
                 {
-                    IsDelegator = propertyName?.ToLower() == "delegator",
+                    IsDelegator = propertyName?.ToLowerInvariant() == "delegator",
                     DelegatorPublicKey = delegatorPk != null ? PublicKey.FromHexString(delegatorPk) : null,
                     ValidatorPublicKey = PublicKey.FromHexString(validatorPk),
                     Amount = amount
diff --git a/Casper.Network.SDK/Types/StoredValue.cs b/Casper.Network.SDK/Types/StoredValue.cs
@@ -45,10 +45,10 @@ public override StoredValue Read(
                 if (reader.TokenType != JsonTokenType.PropertyName)
                     throw new JsonException("Cannot deserialize StoredValue. PropertyName expected");
 
-                var propertyName = reader.GetString();
+                var propertyName = reader.GetString()?.ToLowerInvariant();
                 reader.Read();
 
-                if (propertyName.ToLower() == "contract")
+                if (propertyName == "contract")
                 {
                     var contract = JsonSerializer.Deserialize<Contract>(ref reader, options);
                     reader.Read(); // end Contract object
@@ -57,7 +57,7 @@ public override StoredValue Read(
                         Contract = contract
                     };
                 }
-                else if (propertyName.ToLower() == "clvalue")
+                else if (propertyName == "clvalue")
                 {
                     var clValue = JsonSerializer.Deserialize<CLValue>(ref reader, options);
                     reader.Read(); // end CLValue object
@@ -66,7 +66,7 @@ public override StoredValue Read(
                         CLValue = clValue
                     };
                 }
-                else if (propertyName.ToLower() == "account")
+                else if (propertyName == "account")
                 {
                     var account = JsonSerializer.Deserialize<Account>(ref reader, options);
                     reader.Read(); // end Account object
@@ -75,7 +75,7 @@ public override StoredValue Read(
                         Account = account
                     };
                 }
-                else if (propertyName.ToLower() == "contractwasm")
+                else if (propertyName == "contractwasm")
                 {
                     var wasmBytes = reader.GetString();
                     reader.Read(); // wasm bytes
@@ -84,7 +84,7 @@ public override StoredValue Read(
                         ContractWasm = wasmBytes
                     };
                 }
-                else if (propertyName.ToLower() == "contractpackage")
+                else if (propertyName == "contractpackage")
                 {
                     var contractPackage = JsonSerializer.Deserialize<ContractPackage>(ref reader, options);
                     reader.Read(); // end ContractPackage object
@@ -93,7 +93,7 @@ public override StoredValue Read(
                         ContractPackage = contractPackage
                     };
                 }
-                else if (propertyName.ToLower() == "transfer")
+                else if (propertyName == "transfer")
                 {
                     var transfer = JsonSerializer.Deserialize<Transfer>(ref reader, options);
                     reader.Read(); // end Transfer object
@@ -102,7 +102,7 @@ public override StoredValue Read(
                         Transfer = transfer
                     };
                 }
-                else if (propertyName.ToLower() == "deployinfo")
+                else if (propertyName == "deployinfo")
                 {
                     var deployInfo = JsonSerializer.Deserialize<DeployInfo>(ref reader, options);
                     reader.Read(); // end DeployInfo object
@@ -111,7 +111,7 @@ public override StoredValue Read(
                         DeployInfo = deployInfo
                     };
                 }
-                else if (propertyName.ToLower() == "erainfo")
+                else if (propertyName == "erainfo")
                 {
                     var eraInfo = JsonSerializer.Deserialize<EraInfo>(ref reader, options);
                     reader.Read(); // end EraInfo object
@@ -120,7 +120,7 @@ public override StoredValue Read(
                         EraInfo = eraInfo
                     };
                 }
-                else if (propertyName.ToLower() == "bid")
+                else if (propertyName == "bid")
                 {
                     var bid = JsonSerializer.Deserialize<Bid>(ref reader, options);
                     reader.Read(); // end Bid object
@@ -129,7 +129,7 @@ public override StoredValue Read(
                         Bid = bid
                     };
                 }
-                else if (propertyName.ToLower() == "withdraw")
+                else if (propertyName == "withdraw")
                 {
                     var withdraw = JsonSerializer.Deserialize<List<UnbondingPurse>>(ref reader, options);
                     reader.Read(); // end Withdraw object

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ private Task ListenChannelAsync(ChannelType channelType, int? startFrom, Cancell`
`276`	`276`	`try`
`277`	`277`	`{`
`278`	`278`	`var uriBuilder = new UriBuilder(new Uri(client.BaseAddress +`
`279`		`- $"events/{channelType.ToString().ToLower()}"));`
	`279`	`+ $"events/{channelType.ToString().ToLowerInvariant()}"));`
`280`	`280`
`281`	`281`	`if (startFrom != null && startFrom != int.MaxValue)`
`282`	`282`	`uriBuilder.Query = $"start_from={startFrom}";`
Original file line number	Diff line number	Diff line change
`@@ -67,10 +67,10 @@ public override Delegator Read(`
`67`	`67`
`68`	`68`	`while (reader.TokenType == JsonTokenType.PropertyName)`
`69`	`69`	`{`
`70`		`- var property = reader.GetString();`
	`70`	`+ var property = reader.GetString()?.ToLowerInvariant();`
`71`	`71`	`reader.Read();`
`72`	`72`
`73`		`- switch (property.ToLower())`
	`73`	`+ switch (property)`
`74`	`74`	`{`
`75`	`75`	`case "delegator_public_key":`
`76`	`76`	`case "public_key":`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public override EntryPointAccess Read(`
`32`	`32`	`if (reader.TokenType == JsonTokenType.String)`
`33`	`33`	`{`
`34`	`34`	`var value = reader.GetString();`
`35`		`- if (value.ToLower() == "public")`
	`35`	`+ if (value.ToLowerInvariant() == "public")`
`36`	`36`	`return new EntryPointAccess()`
`37`	`37`	`{`
`38`	`38`	`IsPublic = true,`
`@@ -44,7 +44,7 @@ public override EntryPointAccess Read(`
`44`	`44`	`reader.Read(); // start object`
`45`	`45`	`var value = reader.GetString(); // read property`
`46`	`46`	`reader.Read();`
`47`		`- if (value.ToLower() == "groups")`
	`47`	`+ if (value.ToLowerInvariant() == "groups")`
`48`	`48`	`{`
`49`	`49`	`List<string> groups = JsonSerializer.Deserialize<List<string>>(ref reader, options);`
`50`	`50`	`reader.Read(); // end array`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public override ExecutionResult Read(`
`70`	`70`	`var property = reader.GetString();`
`71`	`71`	`reader.Read();`
`72`	`72`
`73`		`- switch (property.ToLower())`
	`73`	`+ switch (property.ToLowerInvariant())`
`74`	`74`	`{`
`75`	`75`	`case "block_hash":`
`76`	`76`	`blockHash = reader.GetString();`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ public void WriteToPem(string filePath)`
`168`	`168`	`public string GetAccountHash()`
`169`	`169`	`{`
`170`	`170`	`var bcBl2bdigest = new Org.BouncyCastle.Crypto.Digests.Blake2bDigest(256);`
`171`		`- string algo = KeyAlgorithm.ToString().ToLower();`
	`171`	`+ string algo = KeyAlgorithm.ToString().ToLowerInvariant();`
`172`	`172`	`bcBl2bdigest.BlockUpdate(System.Text.Encoding.UTF8.GetBytes(algo), 0, algo.Length);`
`173`	`173`	`bcBl2bdigest.Update(0x00);`
`174`	`174`	`bcBl2bdigest.BlockUpdate(RawBytes, 0, RawBytes.Length);`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public override SeigniorageAllocation Read(`
`74`	`74`
`75`	`75`	`return new SeigniorageAllocation()`
`76`	`76`	`{`
`77`		`- IsDelegator = propertyName?.ToLower() == "delegator",`
	`77`	`+ IsDelegator = propertyName?.ToLowerInvariant() == "delegator",`
`78`	`78`	`DelegatorPublicKey = delegatorPk != null ? PublicKey.FromHexString(delegatorPk) : null,`
`79`	`79`	`ValidatorPublicKey = PublicKey.FromHexString(validatorPk),`
`80`	`80`	`Amount = amount`
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,10 @@ public override StoredValue Read(`
`45`	`45`	`if (reader.TokenType != JsonTokenType.PropertyName)`
`46`	`46`	`throw new JsonException("Cannot deserialize StoredValue. PropertyName expected");`
`47`	`47`
`48`		`- var propertyName = reader.GetString();`
	`48`	`+ var propertyName = reader.GetString()?.ToLowerInvariant();`
`49`	`49`	`reader.Read();`
`50`	`50`
`51`		`- if (propertyName.ToLower() == "contract")`
	`51`	`+ if (propertyName == "contract")`
`52`	`52`	`{`
`53`	`53`	`var contract = JsonSerializer.Deserialize<Contract>(ref reader, options);`
`54`	`54`	`reader.Read(); // end Contract object`
`@@ -57,7 +57,7 @@ public override StoredValue Read(`
`57`	`57`	`Contract = contract`
`58`	`58`	`};`
`59`	`59`	`}`
`60`		`- else if (propertyName.ToLower() == "clvalue")`
	`60`	`+ else if (propertyName == "clvalue")`
`61`	`61`	`{`
`62`	`62`	`var clValue = JsonSerializer.Deserialize<CLValue>(ref reader, options);`
`63`	`63`	`reader.Read(); // end CLValue object`
`@@ -66,7 +66,7 @@ public override StoredValue Read(`
`66`	`66`	`CLValue = clValue`
`67`	`67`	`};`
`68`	`68`	`}`
`69`		`- else if (propertyName.ToLower() == "account")`
	`69`	`+ else if (propertyName == "account")`
`70`	`70`	`{`
`71`	`71`	`var account = JsonSerializer.Deserialize<Account>(ref reader, options);`
`72`	`72`	`reader.Read(); // end Account object`
`@@ -75,7 +75,7 @@ public override StoredValue Read(`
`75`	`75`	`Account = account`
`76`	`76`	`};`
`77`	`77`	`}`
`78`		`- else if (propertyName.ToLower() == "contractwasm")`
	`78`	`+ else if (propertyName == "contractwasm")`
`79`	`79`	`{`
`80`	`80`	`var wasmBytes = reader.GetString();`
`81`	`81`	`reader.Read(); // wasm bytes`
`@@ -84,7 +84,7 @@ public override StoredValue Read(`
`84`	`84`	`ContractWasm = wasmBytes`
`85`	`85`	`};`
`86`	`86`	`}`
`87`		`- else if (propertyName.ToLower() == "contractpackage")`
	`87`	`+ else if (propertyName == "contractpackage")`
`88`	`88`	`{`
`89`	`89`	`var contractPackage = JsonSerializer.Deserialize<ContractPackage>(ref reader, options);`
`90`	`90`	`reader.Read(); // end ContractPackage object`
`@@ -93,7 +93,7 @@ public override StoredValue Read(`
`93`	`93`	`ContractPackage = contractPackage`
`94`	`94`	`};`
`95`	`95`	`}`
`96`		`- else if (propertyName.ToLower() == "transfer")`
	`96`	`+ else if (propertyName == "transfer")`
`97`	`97`	`{`
`98`	`98`	`var transfer = JsonSerializer.Deserialize<Transfer>(ref reader, options);`
`99`	`99`	`reader.Read(); // end Transfer object`
`@@ -102,7 +102,7 @@ public override StoredValue Read(`
`102`	`102`	`Transfer = transfer`
`103`	`103`	`};`
`104`	`104`	`}`
`105`		`- else if (propertyName.ToLower() == "deployinfo")`
	`105`	`+ else if (propertyName == "deployinfo")`
`106`	`106`	`{`
`107`	`107`	`var deployInfo = JsonSerializer.Deserialize<DeployInfo>(ref reader, options);`
`108`	`108`	`reader.Read(); // end DeployInfo object`
`@@ -111,7 +111,7 @@ public override StoredValue Read(`
`111`	`111`	`DeployInfo = deployInfo`
`112`	`112`	`};`
`113`	`113`	`}`
`114`		`- else if (propertyName.ToLower() == "erainfo")`
	`114`	`+ else if (propertyName == "erainfo")`
`115`	`115`	`{`
`116`	`116`	`var eraInfo = JsonSerializer.Deserialize<EraInfo>(ref reader, options);`
`117`	`117`	`reader.Read(); // end EraInfo object`
`@@ -120,7 +120,7 @@ public override StoredValue Read(`
`120`	`120`	`EraInfo = eraInfo`
`121`	`121`	`};`
`122`	`122`	`}`
`123`		`- else if (propertyName.ToLower() == "bid")`
	`123`	`+ else if (propertyName == "bid")`
`124`	`124`	`{`
`125`	`125`	`var bid = JsonSerializer.Deserialize<Bid>(ref reader, options);`
`126`	`126`	`reader.Read(); // end Bid object`
`@@ -129,7 +129,7 @@ public override StoredValue Read(`
`129`	`129`	`Bid = bid`
`130`	`130`	`};`
`131`	`131`	`}`
`132`		`- else if (propertyName.ToLower() == "withdraw")`
	`132`	`+ else if (propertyName == "withdraw")`
`133`	`133`	`{`
`134`	`134`	`var withdraw = JsonSerializer.Deserialize<List<UnbondingPurse>>(ref reader, options);`
`135`	`135`	`reader.Read(); // end Withdraw object`