Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: check eviction filter for new providers #542

Merged
merged 1 commit into from
May 20, 2024
Merged

fix: check eviction filter for new providers #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/utils/src/abstract-session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export abstract class AbstractSession<Provider, RetrieveBlockProgressEvents exte
}

isEvicted (provider: Provider): boolean {
return this.providers.some(prov => this.equals(prov, provider))
return this.evictionFilter.has(this.toEvictionKey(provider))
Copy link
Member

Choose a reason for hiding this comment

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

bah.. how did I miss that

}

hasProvider (provider: Provider): boolean {
Expand Down
21 changes: 21 additions & 0 deletions packages/utils/test/abstract-session.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,4 +233,25 @@ describe('abstract-session', () => {
})).to.eventually.be.rejected()
.with.property('code', 'ABORT_ERR')
})

it('should not make multiple requests to the only found provider', async function () {
const session = new Session()
const cid = CID.parse('bafybeifaymukvfkyw6xgh4th7tsctiifr4ea2btoznf46y6b2fnvikdczi')
const id = await createEd25519PeerId() // same provider

session.findNewProviders.callsFake(async function * () {
yield {
id
}
})
session.queryProvider.callsFake(async () => {
// always fails
throw new Error('Urk!')
})

await expect(session.retrieve(cid)).to.eventually.be.rejected()

expect(session.findNewProviders).to.have.property('callCount', 2)
expect(session.queryProvider).to.have.property('callCount', 1)
})
})
Loading