logos-messaging/logos-delivery
1
0
Fork 0
mirror of https://github.com/logos-messaging/logos-delivery.git synced 2026-07-26 06:23:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(store): adapt eligibility API to api-shape phase2 node layout

Browse Source 
After rebasing onto upstream master (api-shape phase2, #3999), the FFI
context type moved from Waku to LogosDelivery, and the Waku node is now
nested under LogosDelivery.waku. Update eligibility_api.nim:

- import logos_delivery (LogosDelivery) + logos_delivery/waku/waku (Waku)
  instead of the retired logos_delivery/waku/factory/waku path
- FFIContext[Waku] -> FFIContext[LogosDelivery]
- ctx.myLib[].node.* -> ctx.myLib[].waku.node.*

liblogosdelivery builds; eligibility smoke + N8 canonical parity +
hooks tests pass.
This commit is contained in:
Sergei Tikhomirov 2026-07-01 18:39:07 +02:00
parent 83785aa472
commit 6459336809
No known key found for this signature in database
GPG Key ID: 6A1F8ED9D6538027
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
library/store_eligibility/eligibility_api.nim
View File

@ -1,7 +1,8 @@
import std/[json, options, strutils, tables, sugar, locks]
import chronos, results, stew/byteutils, ffi
import
logos_delivery/waku/factory/waku,
logos_delivery,
logos_delivery/waku/waku,
logos_delivery/waku/waku_core/peers,
logos_delivery/waku/waku_store/[
common, protocol, client, eligibility_canonical, eligibility_hooks
@ -39,14 +40,14 @@ proc getOrCreateStateUnlocked(key: pointer): StoreEligibilityState =
result = StoreEligibilityState.new()
storeEligibilityByCtx[key] = result
proc dropState*(ctx: ptr FFIContext[Waku]) =
proc dropState*(ctx: ptr FFIContext[LogosDelivery]) =
eligibilityHookLock.acquire()
defer:
eligibilityHookLock.release()
storeEligibilityByCtx.del cast[pointer](ctx)
proc applyVerifierWrapper*(ctx: ptr FFIContext[Waku], state: StoreEligibilityState) =
let store = ctx.myLib[].node.wakuStore
proc applyVerifierWrapper*(ctx: ptr FFIContext[LogosDelivery], state: StoreEligibilityState) =
let store = ctx.myLib[].waku.node.wakuStore
if store.isNil:
return
if not state.handlerWrapped:
@ -56,15 +57,15 @@ proc applyVerifierWrapper*(ctx: ptr FFIContext[Waku], state: StoreEligibilitySta
state.verifierCb, state.verifierUserData, state.innerHandler, store
)
proc clearVerifierWrapper*(ctx: ptr FFIContext[Waku], state: StoreEligibilityState) =
let store = ctx.myLib[].node.wakuStore
proc clearVerifierWrapper*(ctx: ptr FFIContext[LogosDelivery], state: StoreEligibilityState) =
let store = ctx.myLib[].waku.node.wakuStore
if store.isNil or not state.handlerWrapped:
return
store.requestHandler = state.innerHandler
state.handlerWrapped = false
proc logosdelivery_set_eligibility_verifier(
ctx: ptr FFIContext[Waku], cb: EligibilityVerifierCb, userData: pointer
ctx: ptr FFIContext[LogosDelivery], cb: EligibilityVerifierCb, userData: pointer
): cint {.dynlib, exportc, cdecl.} =
initializeLibrary()
if isNil(ctx):
@ -82,7 +83,7 @@ proc logosdelivery_set_eligibility_verifier(
RET_OK
proc logosdelivery_set_eligibility_provider(
ctx: ptr FFIContext[Waku], cb: EligibilityProviderCb, userData: pointer
ctx: ptr FFIContext[LogosDelivery], cb: EligibilityProviderCb, userData: pointer
): cint {.dynlib, exportc, cdecl.} =
initializeLibrary()
if isNil(ctx):
@ -95,7 +96,7 @@ proc logosdelivery_set_eligibility_provider(
state.providerUserData = userData
RET_OK
proc snapshotProviderCb(ctx: ptr FFIContext[Waku]): (EligibilityProviderCb, pointer) {.
proc snapshotProviderCb(ctx: ptr FFIContext[LogosDelivery]): (EligibilityProviderCb, pointer) {.
gcsafe
.} =
eligibilityHookLock.acquire()
@ -108,7 +109,7 @@ proc snapshotProviderCb(ctx: ptr FFIContext[Waku]): (EligibilityProviderCb, poin
return (state.providerCb, state.providerUserData)
proc logosdelivery_store_query(
ctx: ptr FFIContext[Waku],
ctx: ptr FFIContext[LogosDelivery],
callback: FFICallBack,
userData: pointer,
queryJson: cstring,
@ -156,7 +157,7 @@ proc logosdelivery_store_query(
storeQueryRequest.eligibilityProof = some(proofBytes)
let queryResponse = (
await ctx.myLib[].node.wakuStoreClient.query(storeQueryRequest, peer)
await ctx.myLib[].waku.node.wakuStoreClient.query(storeQueryRequest, peer)
).valueOr:
return err("StoreRequest failed store query: " & $error)