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.

Sign up for GitHub

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

Fix NEO callstates #3599

Merged
merged 21 commits into from
Dec 19, 2024
Merged

Fix NEO callstates #3599

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4a1f660
Allow callstates to use HF
shargon Nov 26, 2024
6f31b4e
Rename to method
shargon Nov 26, 2024
a60bdac
Other rename
shargon Nov 26, 2024
6fa19aa
Change the way
shargon Nov 26, 2024
66804dd
Reduce changes
shargon Nov 26, 2024
4bced57
Reduce changes
shargon Nov 26, 2024
2d760c1
Adapt name always
shargon Nov 26, 2024
4eb75bc
Avoid string when only is lower the first char
shargon Nov 26, 2024
a989f9c
UT
shargon Nov 26, 2024
f860146
Test all
shargon Nov 26, 2024
68f3fdd
Update src/Neo/ProtocolSettings.cs
shargon Nov 26, 2024
9bebffe
Update src/Neo/ProtocolSettings.cs
shargon Nov 26, 2024
2dd5e29
Reuse Load from stream
shargon Nov 27, 2024
6c7c89a
Unify
shargon Nov 27, 2024
c6db216
Fix default logic
shargon Nov 27, 2024
dad7e0d
Change ContractMethod to allowMultiple
shargon Nov 27, 2024
ca9ddad
Use LowerInvariant
shargon Nov 27, 2024
753b66b
Move CheckingHardfork
shargon Nov 27, 2024
21444f0
Remove optional arg
shargon Dec 1, 2024
01ef226
Fix build
shargon Dec 1, 2024
9432a2a
Avoid file not found error
shargon Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Neo/ProtocolSettings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
/// <returns>The loaded <see cref="ProtocolSettings"/>.</returns>
public static ProtocolSettings Load(Stream stream)
{
var config = new ConfigurationBuilder().AddJsonStream(stream).Build();
using var config = new ConfigurationBuilder().AddJsonStream(stream).Build();

Check failure on line 134 in src/Neo/ProtocolSettings.cs

View workflow job for this annotation

GitHub Actions / Test-Everything 

'IConfigurationRoot': type used in a using statement must be implicitly convertible to 'System.IDisposable'.

Check failure on line 134 in src/Neo/ProtocolSettings.cs

View workflow job for this annotation

GitHub Actions / Test-Everything 

'IConfigurationRoot': type used in a using statement must be implicitly convertible to 'System.IDisposable'.

Check failure on line 134 in src/Neo/ProtocolSettings.cs

View workflow job for this annotation

GitHub Actions / Test-Everything 

'IConfigurationRoot': type used in a using statement must be implicitly convertible to 'System.IDisposable'.

Check failure on line 134 in src/Neo/ProtocolSettings.cs

View workflow job for this annotation

GitHub Actions / Test-Everything 

'IConfigurationRoot': type used in a using statement must be implicitly convertible to 'System.IDisposable'.

Check failure on line 134 in src/Neo/ProtocolSettings.cs

View workflow job for this annotation

GitHub Actions / Test (macos-latest) 

'IConfigurationRoot': type used in a using statement must be implicitly convertible to 'System.IDisposable'.

Check failure on line 134 in src/Neo/ProtocolSettings.cs

View workflow job for this annotation

GitHub Actions / Test (macos-latest) 

'IConfigurationRoot': type used in a using statement must be implicitly convertible to 'System.IDisposable'.

Check failure on line 134 in src/Neo/ProtocolSettings.cs

View workflow job for this annotation

GitHub Actions / Test (macos-latest) 

'IConfigurationRoot': type used in a using statement must be implicitly convertible to 'System.IDisposable'.

Check failure on line 134 in src/Neo/ProtocolSettings.cs

View workflow job for this annotation

GitHub Actions / Test (macos-latest) 

'IConfigurationRoot': type used in a using statement must be implicitly convertible to 'System.IDisposable'.
Copy link
Member

@cschuchardt88 cschuchardt88 Nov 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ConfigurationBuilder on build uses ConfigurationRoot may have to cast to it. either way needs to be fixed for memory leak.

or could do
((IDisposable)config).Dispose(); at of the method

https://github.com/dotnet/runtime/blob/9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationBuilder.cs#L53C24-L53C41

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was not a memory leak...

Copy link
Member

@cschuchardt88 cschuchardt88 Nov 27, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ConfiguationRoot is the class that is created for inherits from IConfigurationRoot

How isn't it a memory leak, The memory for the providers are still allocated? Streams and all.
https://github.com/dotnet/runtime/blob/9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3/src/libraries/Microsoft.Extensions.Configuration/src/ConfigurationRoot.cs#L99C9-L112C10

Just do (config as IDisposable)?.Dispose() what's the big deal?

var section = config.GetSection("ProtocolConfiguration");
var settings = Load(section);
CheckingHardfork(settings);
Expand Down
Loading