-
Notifications
You must be signed in to change notification settings - Fork 220
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.
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: deleted_txo_mmr_position_to_height_index already exists error #4924
Merged
sdbondi
merged 4 commits into
tari-project:development
from
SWvheerden:sw_add_reorg_test
Nov 22, 2022
Merged
fix: deleted_txo_mmr_position_to_height_index already exists error #4924
sdbondi
merged 4 commits into
tari-project:development
from
SWvheerden:sw_add_reorg_test
Nov 22, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stringhandler
previously approved these changes
Nov 15, 2022
SWvheerden
force-pushed
the
sw_add_reorg_test
branch
from
November 16, 2022 15:31
f59b71d
to
2abb58d
Compare
SWvheerden
changed the title
test: add reorg test for zero_conf
fix: deleted_txo_mmr_position_to_height_index already exists error
Nov 16, 2022
SWvheerden
force-pushed
the
sw_add_reorg_test
branch
from
November 16, 2022 15:33
2abb58d
to
ac4f653
Compare
stringhandler
approved these changes
Nov 17, 2022
sdbondi
added
the
P-conflicts
Process - The PR has merge conflicts that need to be resolved
label
Nov 18, 2022
sdbondi
previously approved these changes
Nov 18, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice, makes sense
stringhandler
previously approved these changes
Nov 18, 2022
SWvheerden
dismissed stale reviews from stringhandler and sdbondi
via
November 18, 2022 07:57
290ce91
SWvheerden
force-pushed
the
sw_add_reorg_test
branch
from
November 18, 2022 07:57
6135d4b
to
290ce91
Compare
sdbondi
approved these changes
Nov 18, 2022
sdbondi
removed
the
P-conflicts
Process - The PR has merge conflicts that need to be resolved
label
Nov 21, 2022
sdbondi
added a commit
to sdbondi/tari
that referenced
this pull request
Nov 23, 2022
* development: fix: add hidden types and seed words to key manager (tari-project#4925) feat: timestamp validation (tari-project#4887) fix: deleted_txo_mmr_position_to_height_index already exists error (tari-project#4924) feat: add default grpc for localnet (tari-project#4937) first commit (tari-project#4926) v0.40.2 fix(dht): use limited ban period for invalid peer (tari-project#4933) feat: upgrade tari_crypto sign api (tari-project#4932) v0.40.1 chore: fix depreciated timestamp clippy (tari-project#4929) chore: fix naming of ffi functions and comments (tari-project#4930) fix: set wallet start scan height to birthday and not 0 (see issue tari-project#4807) (tari-project#4911) v0.40.0 chore: remove unused methods (tari-project#4922) fix: updates for SafePassword API change (tari-project#4927)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes deleted_txo_mmr_position_to_height_index already exists error
Adds in a unit test for the testing zero_conf with a re_org
How Has This Been Tested?
Add a unit test
Fixes: #4833