Skip to content

Fix dotnet-format#541

Merged
erikzhang merged 2 commits intomasterfrom
fix-dotnet-format
Feb 11, 2020
Merged

Fix dotnet-format#541
erikzhang merged 2 commits intomasterfrom
fix-dotnet-format

Conversation

@shargon
Copy link
Copy Markdown
Member

@shargon shargon commented Feb 10, 2020

@shargon shargon changed the title Fix dotnet format Fix dotnet-format Feb 10, 2020
Copy link
Copy Markdown
Member

@vncoelho vncoelho left a comment

Choose a reason for hiding this comment

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

  neo-cli/Services/ServiceProxy.cs(1,1): Fix file encoding.
  Complete in 387ms.
  Formatted code file 'ServiceProxy.cs'.
  Formatted 1 of 10 files.
  Format complete in 2655ms.

Still with problems here.

I imagined it was version, @shargon, perhaps it is really better to fix the version like this as you did.

@shargon
Copy link
Copy Markdown
Member Author

shargon commented Feb 10, 2020

@vncoelho hahah I spent two days with this issue xD

@superboyiii
Copy link
Copy Markdown
Member

superboyiii commented Feb 11, 2020

@shargon Good job!

Test steps:

  1. Fork neo-node(master) on my local repository and applied git workflow.
  2. Git push PR Fix NEP5 test #539, start .NET Core Test (expect fail).
  3. Git push PR Fix dotnet-format #541, start .NET Core Test (expect pass).
  4. Merge Fix dotnet-format #541 into local master.
  5. Rerun step2's Test again(expect Pass).

Test Result: [PASS]
image

@erikzhang erikzhang merged commit 0f91c7f into master Feb 11, 2020
@erikzhang erikzhang deleted the fix-dotnet-format branch February 11, 2020 09:11
Jim8y pushed a commit to Jim8y/neo-node that referenced this pull request Aug 18, 2021
* Add commit phase to consensus algorithm (neo-project#534)

* Add commit phase to consensus algorithm

* fix tests

* Prevent repeated sending of `Commit` messages

* RPC call gettransactionheight (neo-project#541)

* getrawtransactionheight

Nowadays two calls are need to get a transaction height, `getrawtransaction` with `verbose` and then use the `blockhash`.
Other option is to use `confirmations`, but it can be misleading.

* Minnor fix

* Shargon's tip

* modified

* Allow to use the wallet inside a RPC plugin (neo-project#536)

* Clean code

* Clean code

* Minor fix on mempoolVerified

* Add MemoryPool Unit tests. Fix bug on initital start of Persisting the Genesis block.

* Prevent `ConsensusService` from receiving messages before starting (neo-project#573)

* Prevent `ConsensusService` from receiving messages before starting

* fixed tests - calling OnStart now

* Consensus recovery log (neo-project#572)

* Pass store to `ConsensusService`

* Implement `ISerializable` in `ConsensusContext`

* Start from recovery log

* Fix unit tests due to constructor taking the store.

* Add unit tests for serializing and deserializing the consensus context.

* Combine `ConsensusContext.ChangeView()` and `ConsensusContext.Reset()`

* Add `PreparationHash` field to `PrepareResponse` to prevent replay attacks from malicious primary (neo-project#576)

* Fixed a problem where `PrepareResponse.PreparationHash` was not assigned.

* Load context from store only when height matches

* Recover nodes requesting ChangeView when possible (neo-project#579)

* Fixes bug in `OnPrepareRequestReceived()`

* Send `RecoveryMessage` only when `message.NewViewNumber <= context.ViewNumber`

* Fix and optimize view changing (#590)

* Allow to ignore the recovery logs

* Add `isRecovering` (neo-project#594)

* Fix accepting own prepare request (neo-project#596)

* Pick some changes from neo-project#575.

* Fixes `Prefixes`

* Restore transactions from saved consensus context (neo-project#598)

* Refactoring

* AggressiveInlining (neo-project#606)

* Reset Block reference when consensus context is initialized after block persist. (neo-project#608)

* Change `ConsensusPayload` for compatibility (neo-project#609)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants