Skip to content

Commit

Permalink
fix dependency (#334)
Browse files Browse the repository at this point in the history
## Describe your changes and provide context
This fixes a dependency that was refactored, and enables commit push CI
for occ-main

## Testing performed to validate your change
CI
  • Loading branch information
udpatil committed Jan 18, 2024
1 parent f5bcfd1 commit fc40ee5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
push:
branches:
- main
- occ-main # TODO: remove after occ work is done

permissions:
contents: read
Expand Down
6 changes: 3 additions & 3 deletions store/multiversion/memiterator.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
dbm "github.com/tendermint/tm-db"

"github.com/cosmos/cosmos-sdk/store/types"
scheduler "github.com/cosmos/cosmos-sdk/types/occ"
occtypes "github.com/cosmos/cosmos-sdk/types/occ"
)

// Iterates over iterKVCache items.
Expand All @@ -16,7 +16,7 @@ type memIterator struct {
mvStore MultiVersionStore
writeset map[string][]byte
index int
abortChannel chan scheduler.Abort
abortChannel chan occtypes.Abort
}

func (store *VersionIndexedStore) newMemIterator(
Expand Down Expand Up @@ -63,7 +63,7 @@ func (mi *memIterator) Value() []byte {

// if we have an estiamte, write to abort channel
if val.IsEstimate() {
mi.abortChannel <- scheduler.NewEstimateAbort(val.Index())
mi.abortChannel <- occtypes.NewEstimateAbort(val.Index())
}

// if we have a deleted value, return nil
Expand Down

0 comments on commit fc40ee5

Please sign in to comment.