Skip to content
This repository has been archived by the owner on Aug 23, 2020. It is now read-only.

Race and update fixes #1838

Merged
merged 15 commits into from
Apr 14, 2020
Merged

Race and update fixes #1838

merged 15 commits into from
Apr 14, 2020

Conversation

acha-bill
Copy link
Contributor

Description

Ports #1831 from dev to release-v1.9.0 which includes #1805 and other merge commits.

Type of change

  • Enhancement (a non-breaking change which adds functionality)

How Has This Been Tested?

  • existing unit tests pass

Checklist:

  • My code follows the style guidelines for this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

acha-bill and others added 15 commits March 1, 2020 21:20
@acha-bill
rename zmq tx_trytes to trytes (iotaledger#1772)
aa0e2b1
@JakeSCahill
Update/contributing (iotaledger#1766)
1990b43 
* Update contributing guide and add Code of Conduct

* Add details

* Implement reviewers comments
Update regression structure (iotaledger#1764)
339a7d7 
* Rearrange test order

* Update README

* m6 -> m1 in feature file

* m4 -> m5 in feature file
Merge branch 'release-v1.8.5' into dev
0e39213
@DyrellC
Update regression logging (iotaledger#1803)
2a5cf10
@DyrellC
Move validation to validation service package (iotaledger#1804)
a62dff0
Merge branch 'release-v1.9.0' into dev
ea93cbf
Merge 1.9.0 into dev before release (iotaledger#1824)
18421e3
@DyrellC
Add transaction solidifier (iotaledger#1805)
739ea7a 
* Move validation to validation service package

* Add Transaction Solidifier

* Update Transaction Validator

* Update Unit Tests

* Remove tip field from solidify stage

* Move broadcast queue retreival to solidify stage

* Undo auto-formatting

* More autoformatting

* Re-remove refillBroadcast

* Move propagation logic to inner class

* Remove unused imports

* Add comment to propagator

* Remove unused txSolidifier private field

* Remove separate thread logic, check solidity from milestone solidifier

* LinkedHashSet -> ArrayDeque in checkSolidity

* Update maxProcessedTransactions value determination

* Make Transaction Propagator private

* Typo correction

Co-authored-by: Gal Rogozinski <gal.rogozinski@iota.org>
@acha-bill @DyrellC
Test: Fix getinclusion assertion to what it should be (iotaledger#1819)
b7d5215 
Co-authored-by: Gal Rogozinski <gal.rogozinski@iota.org>
Co-authored-by: Dyrell Chapman <dyrell.chapman@iota.org>
@DyrellC @acha-bill
Regression: Update pruning test (iotaledger#1775)
57d2e35 
* Update pruning test for before and after pruning status

* m6 -> m1

Co-authored-by: Gal Rogozinski <gal.rogozinski@iota.org>
@DyrellC @acha-bill
Fix: Update Broadcast Stage logic (iotaledger#1827)
0552fb9 
* Update broadcast fetch logic

* Comment
@acha-bill
always update persit tx updates
9076012
@acha-bill
use Atomic for possibly racy fields
347d4b8
@acha-bill
fix merge conflicts
ca75abb
@GalRogozinski GalRogozinski merged commit e8ffdeb into iotaledger:release-v1.9.0 Apr 14, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@GalRogozinski GalRogozinski GalRogozinski approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@acha-bill @GalRogozinski @JakeSCahill @DyrellC