Skip to content

Commit

Permalink
Merge pull request #229 from kcalvinalvin/2024-12-30-remove-udata-req…
Browse files Browse the repository at this point in the history
…uirement-from-extract-accumulator-adds

blockchain: remove udata requirement from ExtractAccumulatorAdds
  • Loading branch information
kcalvinalvin authored Dec 30, 2024
2 parents 7111fb7 + 2e411e1 commit 03ed304
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
rust:
- version: stable
clippy: true
- version: 1.73.0 # As specified in rust-toolchain
- version: 1.78.0 # As specified in rust-toolchain
steps:
- uses: actions/checkout@v3

Expand Down
6 changes: 0 additions & 6 deletions blockchain/utreexoviewpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -279,12 +279,6 @@ func ExtractAccumulatorDels(block *btcutil.Block, bestChain *chainView, remember
func ExtractAccumulatorAdds(block *btcutil.Block, bestChain *chainView, remembers []uint32) (
[]utreexo.Leaf, error) {

// Check that UData field isn't nil before doing anything else.
if block.MsgBlock().UData == nil {
return nil, fmt.Errorf("ExtractAccumulatorAdds(): block.MsgBlock().UData is nil. " +
"Cannot extract utreexo accumulator additions")
}

// outskip is all the txOuts that are referenced by a txIn in the same block
// outCount is the count of all outskips.
_, outCount, _, outskip := DedupeBlock(block)
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.73.0"
channel = "1.78.0"
components = ["clippy", "rustfmt"]

0 comments on commit 03ed304

Please sign in to comment.