stigmerge_peer 0.6.2

stigmerge p2p protocol and agent components
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
use std::{
    collections::{HashMap, VecDeque},
    path::{Path, PathBuf},
    sync::Arc,
};

use tokio::{select, spawn, sync::Mutex, task::JoinHandle};
use tokio_util::sync::CancellationToken;
use tracing::{instrument, trace, warn};
use veilid_core::{RecordKey, RouteId, ValueSubkeyRangeSet, VeilidRouteChange};
use veilnet::{
    connection::{RoutingContext, UpdateHandler, API},
    Connection,
};

use crate::{
    content_addressable::ContentAddressable,
    error::CancelError,
    record::{StableHaveMap, StableShareRecord},
    types::RemoteShareInfo,
    Error, Result, Retry,
};

#[derive(Clone)]
pub struct ShareResolver<C: Connection> {
    inner: Arc<Mutex<ShareResolverInner<C>>>,
}

struct TaskArgs<C: Connection> {
    cancel: CancellationToken,
    retry: Retry,
    dead_routes_rx: flume::Receiver<Vec<RouteId>>,
    inner: Arc<Mutex<ShareResolverInner<C>>>,
}

impl<C: Connection + Send + Sync + 'static> ShareResolver<C> {
    pub fn new_task(
        cancel: CancellationToken,
        retry: Retry,
        conn: C,
        root: &Path,
    ) -> (Self, JoinHandle<Result<()>>) {
        let (dead_routes_handler, dead_routes_rx) = DeadRoutesHandler::new(cancel.child_token());
        conn.add_update_handler(Box::new(dead_routes_handler));
        let inner = Arc::new(Mutex::new(ShareResolverInner::new(conn, root)));

        let task = spawn(Self::run(TaskArgs {
            cancel: cancel.child_token(),
            retry,
            dead_routes_rx,
            inner: inner.clone(),
        }));

        (Self { inner }, task)
    }

    pub async fn subscribe(&self, handler: Box<dyn ShareHandler + Send + Sync>) {
        self.inner.lock().await.add_share_handler(handler).await
    }

    #[instrument(skip(self), err)]
    pub async fn add_share(&self, key: &RecordKey) -> Result<RemoteShareInfo> {
        let share_info = self.inner.lock().await.resolve_and_watch(key).await?;
        Ok(share_info)
    }

    pub async fn refresh_share(&self, route_id: &RouteId) -> Result<()> {
        let mut inner = self.inner.lock().await;
        let share = {
            inner
                .remote_shares
                .get(route_id)
                .ok_or(Error::msg("route_id not found"))?
                .clone()
        };
        inner.refresh(share).await?;
        Ok(())
    }

    pub async fn remove_share(&self, key: &RecordKey) -> Result<()> {
        self.inner.lock().await.remove(key).await?;
        Ok(())
    }

    async fn run(args: TaskArgs<C>) -> Result<()> {
        loop {
            select! {
                _ = args.cancel.cancelled() => {
                    return Err(CancelError.into());
                }
                res = args.dead_routes_rx.recv_async() => {
                    let dead_routes = res?;
                    for dead_route in dead_routes.iter() {
                        let share = {
                            args.inner.lock().await.remote_shares.get(dead_route).cloned()
                        };
                        if let Some(share) = share {
                            backoff_retry!(args.cancel, args.retry, {
                                args.inner.lock().await.refresh(share.clone()).await?;
                            })?;
                        }
                    }
                }
            }
        }
    }
}

struct ShareResolverInner<C: Connection> {
    conn: C,
    root: PathBuf,
    remote_shares: HashMap<RouteId, RemoteShareInfo>,
    handlers: HandlerChain,
}

impl<C: Connection + Send + Sync + 'static> ShareResolverInner<C> {
    fn new(conn: C, root: &Path) -> Self {
        Self {
            conn,
            root: root.to_path_buf(),
            remote_shares: HashMap::new(),
            handlers: HandlerChain::default(),
        }
    }

    async fn add_share_handler(&mut self, handler: Box<dyn ShareHandler + Send + Sync>) {
        self.handlers.add(handler);
    }

    #[instrument(skip(self), err)]
    async fn resolve_and_watch(&mut self, key: &RecordKey) -> Result<RemoteShareInfo> {
        {
            self.conn.require_attachment().await?;
        }
        // Ensure record is open before reading
        let (_, header) = StableShareRecord::new_remote(&mut self.conn, key).await?;
        trace!(
            ?key,
            want_index_digest = hex::encode(header.payload_digest()),
            "read header"
        );
        let mut index =
            StableShareRecord::read_index(&mut self.conn, key, &header, self.root.as_path())
                .await?;
        let index_digest = index.digest()?;
        trace!(?key, index_digest = hex::encode(index_digest), "read index");

        let have_map = match header.have_map() {
            Some(have_map_ref) => {
                StableHaveMap::read_remote(&mut self.conn, have_map_ref.key(), &index).await?
            }
            None => {
                return Err(Error::msg("missing have map"));
            }
        };

        let routing_context = self.conn.routing_context();
        let route_id = routing_context
            .api()
            .import_remote_private_route(header.route_data().to_vec())?;
        trace!(?key, ?route_id, "private route to remote");

        routing_context
            .watch_dht_values(
                key.clone(),
                Some(ValueSubkeyRangeSet::single(0)),
                None,
                None,
            )
            .await?;

        let share = RemoteShareInfo {
            key: key.clone(),
            header: header.clone(),
            index,
            index_digest,
            route_id,
            have_map,
        };
        self.remote_shares
            .insert(share.route_id.clone(), share.clone());
        self.handlers.share_changed(&share)?;
        Ok(share)
    }

    async fn refresh(&mut self, mut share: RemoteShareInfo) -> Result<()> {
        {
            self.conn.require_attachment().await?;
        }
        let header = StableShareRecord::read_header(&mut self.conn, &share.key).await?;
        if header.route_data() == share.header.route_data() {
            return Ok(());
        }

        let routing_context = self.conn.routing_context();
        let route_id = routing_context
            .api()
            .import_remote_private_route(header.route_data().to_vec())?;
        let prior_route_id = share.route_id;
        share.route_id = route_id;
        if let Err(err) = routing_context.api().release_private_route(prior_route_id) {
            warn!(?err, route_id = ?share.route_id, "release prior route");
        }

        self.remote_shares
            .insert(share.route_id.clone(), share.clone());
        self.handlers.share_changed(&share)?;
        Ok(())
    }

    async fn remove(&mut self, key: &RecordKey) -> Result<()> {
        let routing_context = self.conn.routing_context();
        if let Err(err) = routing_context
            .cancel_dht_watch(key.clone(), Some(ValueSubkeyRangeSet::single(0)))
            .await
        {
            warn!(?err, ?key, "cancel share watch");
        }

        let share = { self.remote_shares.values().find(|s| &s.key == key).cloned() };
        if let Some(share) = share {
            self.remote_shares.remove(&share.route_id);
        }
        Ok(())
    }
}

pub trait ShareHandler {
    fn share_changed(&mut self, share: &RemoteShareInfo) -> Result<()>;
}

pub struct ShareNotifier {
    remote_share_tx: flume::Sender<RemoteShareInfo>,
    label: String,
}

impl ShareNotifier {
    pub fn new(label: &str) -> (Self, flume::Receiver<RemoteShareInfo>) {
        let (remote_share_tx, remote_share_rx) = flume::unbounded();
        (
            Self {
                remote_share_tx,
                label: label.to_string(),
            },
            remote_share_rx,
        )
    }
}

impl ShareHandler for ShareNotifier {
    #[instrument(skip_all, fields(label = self.label), err)]
    fn share_changed(&mut self, share: &RemoteShareInfo) -> Result<()> {
        self.remote_share_tx.send(share.clone())?;
        Ok(())
    }
}

#[derive(Default)]
struct HandlerChain {
    handlers: Vec<Box<dyn ShareHandler + Send + Sync>>,
}

impl HandlerChain {
    fn add(&mut self, handler: Box<dyn ShareHandler + Send + Sync>) {
        self.handlers.push(handler);
    }
}

impl ShareHandler for HandlerChain {
    #[instrument(skip_all, fields(key = ?share.key))]
    fn share_changed(&mut self, share: &RemoteShareInfo) -> Result<()> {
        let mut to_remove = VecDeque::new();
        for (i, handler) in self.handlers.iter_mut().enumerate() {
            if let Err(err) = handler.share_changed(share) {
                warn!(?err);
                to_remove.push_back(i);
            }
        }
        if !to_remove.is_empty() {
            self.handlers = self
                .handlers
                .drain(..)
                .enumerate()
                .filter(|(i, _)| {
                    if to_remove.is_empty() {
                        return true;
                    }
                    if to_remove[0] != *i {
                        true
                    } else {
                        to_remove.pop_front();
                        false
                    }
                })
                .map(|(_, h)| h)
                .collect();
        }
        Ok(())
    }
}

struct DeadRoutesHandler {
    cancel: CancellationToken,
    dead_routes_tx: flume::Sender<Vec<RouteId>>,
}

impl DeadRoutesHandler {
    fn new(cancel: CancellationToken) -> (DeadRoutesHandler, flume::Receiver<Vec<RouteId>>) {
        let (route_change_tx, route_change_rx) = flume::unbounded();
        (
            Self {
                cancel,
                dead_routes_tx: route_change_tx,
            },
            route_change_rx,
        )
    }
}

impl UpdateHandler for DeadRoutesHandler {
    fn route_change(&self, change: &VeilidRouteChange) {
        if !change.dead_remote_routes.is_empty() {
            if let Err(err) = self
                .dead_routes_tx
                .send(change.dead_remote_routes.to_owned())
            {
                warn!(?err, "failed to send route change");
                self.cancel.cancel();
            }
        }
    }
    fn shutdown(&self) {
        trace!("shutdown");
        self.cancel.cancel();
    }
}

#[cfg(test)]
mod tests {
    use std::{str::FromStr, sync::Arc};

    use sha2::{Digest as _, Sha256};
    use stigmerge_fileindex::Indexer;
    use tempfile::TempDir;
    use tokio_util::sync::CancellationToken;
    use veilid_core::{
        BarePublicKey, BareRouteId, DHTSchemaDFLT, RecordKey, RouteId, ValueSubkeyRangeSet,
        CRYPTO_KIND_VLD0,
    };
    use veilnet::connection::{
        testing::{create_test_api, StubAPI, StubConnection, StubRoutingContext},
        Connection, RoutingContext,
    };

    use crate::{
        proto::{Encoder, HaveMapRef, Header, PeerMapRef},
        retry::Retry,
        share_resolver::ShareResolver,
        tests::temp_file,
    };

    #[tokio::test]
    async fn test_resolve_index() {
        let tf = temp_file(0xa5u8, 65536);
        let indexer = Indexer::from_file(std::env::temp_dir().join(tf.path()).as_path())
            .await
            .expect("indexer");
        let index = indexer.index().await.expect("index");
        let mut index_digest = Sha256::new();
        index_digest.update(index.encode().expect("encode index"));

        // Create a connection with mock behavior
        let temp_dir = TempDir::new().unwrap();
        let veilid_api = create_test_api(temp_dir.path()).await.unwrap();
        let mut api = StubAPI::new(veilid_api);

        // Mock route import
        api.import_remote_private_route = Arc::new(std::sync::Mutex::new(|_route_data| {
            Ok(RouteId::new(CRYPTO_KIND_VLD0, BareRouteId::new(&[0u8; 32])))
        }));

        // Create a dummy public key for ValueData::new
        let dummy_public_key =
            veilid_core::PublicKey::new(CRYPTO_KIND_VLD0, BarePublicKey::new(&[0u8; 32]));

        let fake_have_map_key: Arc<std::sync::Mutex<Option<RecordKey>>> =
            Arc::new(std::sync::Mutex::new(None));

        let mock_index = index.clone();
        let mock_have_map_key = fake_have_map_key.clone();
        let get_dht_calls = Arc::new(std::sync::Mutex::new(vec![]));
        let watch_calls = Arc::new(std::sync::Mutex::new(vec![]));
        let cancel_watch_calls = Arc::new(std::sync::Mutex::new(Vec::<RecordKey>::new()));

        let mut routing_context = StubRoutingContext::new(api);

        {
            let get_dht_calls = get_dht_calls.clone();
            let dummy_public_key = dummy_public_key.clone();
            let mock_have_map_key = mock_have_map_key.clone();
            routing_context.get_dht_value = Arc::new(tokio::sync::Mutex::new(
                move |key: RecordKey, subkey: u32, _force_refresh| {
                    get_dht_calls.lock().unwrap().push((key.clone(), subkey));
                    if subkey == 0 {
                        // Return header data with have_map
                        let index_internal = mock_index.clone();
                        let index_bytes = index_internal.encode().expect("encode index");
                        let mut header = Header::from_index(
                            &index_internal,
                            index_bytes.as_slice(),
                            &[0xde, 0xad, 0xbe, 0xef],
                        );
                        header.set_have_map(HaveMapRef::new(
                            mock_have_map_key.lock().unwrap().as_ref().unwrap().clone(),
                            1u16,
                        ));
                        let header_bytes = header.encode().expect("encode header");
                        Ok(Some(
                            veilid_core::ValueData::new(header_bytes, dummy_public_key.clone())
                                .unwrap(),
                        ))
                    } else if key == mock_have_map_key.lock().unwrap().as_ref().unwrap().clone() {
                        // Return have_map data for any subkey of the have_map
                        let have_map_data = vec![0u8; 100]; // Dummy have map data
                        Ok(Some(
                            veilid_core::ValueData::new(have_map_data, dummy_public_key.clone())
                                .unwrap(),
                        ))
                    } else {
                        // Return index data for subkey 1
                        let index_internal = mock_index.clone();
                        let index_bytes = index_internal.encode().expect("encode index");
                        Ok(Some(
                            veilid_core::ValueData::new(index_bytes, dummy_public_key.clone())
                                .unwrap(),
                        ))
                    }
                },
            ));
        }

        {
            let watch_calls = watch_calls.clone();
            routing_context.watch_dht_values = Arc::new(tokio::sync::Mutex::new(
                move |key: RecordKey, _values: Option<ValueSubkeyRangeSet>, _expiration, _count| {
                    watch_calls.lock().unwrap().push(key);
                    Ok(true) // Return true instead of ()
                },
            ));
        }

        {
            let cancel_watch_calls = cancel_watch_calls.clone();
            routing_context.cancel_dht_watch = Arc::new(tokio::sync::Mutex::new(
                move |key: RecordKey, _values: Option<ValueSubkeyRangeSet>| {
                    cancel_watch_calls.lock().unwrap().push(key);
                    Ok(true) // Return true instead of ()
                },
            ));
        }
        let mut conn = StubConnection::new(routing_context);
        conn.require_attachment = Arc::new(tokio::sync::Mutex::new(|| Ok(())));
        conn.add_update_handler = Arc::new(std::sync::Mutex::new(|_| ()));

        let dht_rec = conn
            .routing_context()
            .create_dht_record(
                CRYPTO_KIND_VLD0,
                veilid_core::DHTSchema::DFLT(DHTSchemaDFLT::new(2).unwrap()),
                None,
            )
            .await
            .unwrap();
        let fake_key = dht_rec.key().clone();

        // Set have_map key from a created dht record. This puts the DHT record
        // in the local record table, so it appears to be "available" and the
        // connection doesn't try to go out onto the network.
        {
            let dht_rec = conn
                .routing_context()
                .create_dht_record(
                    CRYPTO_KIND_VLD0,
                    veilid_core::DHTSchema::DFLT(DHTSchemaDFLT::new(2).unwrap()),
                    None,
                )
                .await
                .unwrap();
            let mut have_map_key = fake_have_map_key.lock().unwrap();
            *have_map_key = Some(dht_rec.key().clone());
        }

        let cancel = CancellationToken::new();
        let retry = Retry::default();
        let (resolver, resolver_task) =
            ShareResolver::new_task(cancel.clone(), retry, conn, index.root());

        // Test adding a share - this should resolve to index
        let share_info = resolver.add_share(&fake_key).await.expect("add share");

        // Verify the resolved share info
        assert_eq!(share_info.key, fake_key);
        assert_eq!(share_info.index.root(), index.root());

        // Verify the header was created correctly
        let expected_index_bytes = index.encode().expect("encode index");
        let expected_header = Header::from_index(
            &index,
            expected_index_bytes.as_slice(),
            &[0xde, 0xad, 0xbe, 0xef],
        );
        assert_eq!(share_info.header.route_data(), expected_header.route_data());

        // Verify DHT calls were made
        let get_dht_calls = get_dht_calls.lock().unwrap();
        assert_eq!(get_dht_calls.len(), 3); // Header (subkey 0) and index (subkey 1), have map
        assert_eq!(get_dht_calls[0].0, fake_key);
        assert_eq!(get_dht_calls[0].1, 0); // Header subkey
        assert_eq!(get_dht_calls[1].0, fake_key);
        assert_eq!(get_dht_calls[1].1, 1); // Index subkey

        let watch_calls = watch_calls.lock().unwrap();
        assert_eq!(watch_calls.len(), 1);
        assert_eq!(watch_calls[0], fake_key);

        // Test removing the share
        resolver
            .remove_share(&fake_key)
            .await
            .expect("remove share");

        let cancel_watch_calls = cancel_watch_calls.lock().unwrap();
        assert_eq!(cancel_watch_calls.len(), 1);
        assert_eq!(cancel_watch_calls[0], fake_key);

        // Initiate a shutdown
        cancel.cancel();

        // Service run terminates
        resolver_task.await.unwrap().unwrap_err();
    }

    #[tokio::test]
    async fn test_resolve_header() {
        let tf = temp_file(0xa5u8, 65536);
        let indexer = Indexer::from_file(std::env::temp_dir().join(tf.path()).as_path())
            .await
            .expect("indexer");
        let index = indexer.index().await.expect("index");

        let fake_peer_map_key =
            RecordKey::from_str("VLD0:hIfQGdXUq-oO5wwzODJukR7zOGwpNznKYaFoh6uTp2A").expect("key");
        let fake_have_map_key: Arc<std::sync::Mutex<Option<RecordKey>>> =
            Arc::new(std::sync::Mutex::new(None));

        // Create a connection with mock behavior
        let temp_dir = TempDir::new().unwrap();
        let veilid_api = create_test_api(temp_dir.path()).await.unwrap();
        let mut api = StubAPI::new(veilid_api);

        // Mock route import
        api.import_remote_private_route = Arc::new(std::sync::Mutex::new(|_route_data| {
            Ok(RouteId::new(CRYPTO_KIND_VLD0, BareRouteId::new(&[0u8; 32])))
        }));

        // Create a dummy public key for ValueData::new
        let dummy_public_key =
            veilid_core::PublicKey::new(CRYPTO_KIND_VLD0, BarePublicKey::new(&[0u8; 32]));

        let mock_index = index.clone();
        let mock_peer_map_key = fake_peer_map_key.clone();
        let mock_have_map_key = fake_have_map_key.clone();
        let get_dht_calls = Arc::new(std::sync::Mutex::new(vec![]));
        let watch_calls = Arc::new(std::sync::Mutex::new(vec![]));

        let mut routing_context = StubRoutingContext::new(api);
        {
            let get_dht_calls = get_dht_calls.clone();
            let dummy_public_key = dummy_public_key.clone();
            let mock_have_map_key = mock_have_map_key.clone();
            routing_context.get_dht_value = Arc::new(tokio::sync::Mutex::new(
                move |key: RecordKey, subkey: u32, _force_refresh| {
                    get_dht_calls.lock().unwrap().push((key.clone(), subkey));
                    if subkey == 0 {
                        // Return header data with peer_map and have_map
                        let index_internal = mock_index.clone();
                        let index_bytes = index_internal.encode().expect("encode index");
                        let mut header = Header::from_index(
                            &index_internal,
                            index_bytes.as_slice(),
                            &[0xde, 0xad, 0xbe, 0xef],
                        );
                        header.set_peer_map(PeerMapRef::new(mock_peer_map_key.clone(), 1u16));
                        header.set_have_map(HaveMapRef::new(
                            mock_have_map_key.lock().unwrap().as_ref().unwrap().clone(),
                            1u16,
                        ));
                        let header_bytes = header.encode().expect("encode header");
                        Ok(Some(
                            veilid_core::ValueData::new(header_bytes, dummy_public_key.clone())
                                .unwrap(),
                        ))
                    } else if &key == mock_have_map_key.lock().unwrap().as_ref().unwrap() {
                        // Return have_map data for any subkey of have_map
                        let have_map_data = vec![0u8; 100]; // Dummy have map data
                        Ok(Some(
                            veilid_core::ValueData::new(have_map_data, dummy_public_key.clone())
                                .unwrap(),
                        ))
                    } else {
                        // Return index data for subkey 1
                        let index_internal = mock_index.clone();
                        let index_bytes = index_internal.encode().expect("encode index");
                        Ok(Some(
                            veilid_core::ValueData::new(index_bytes, dummy_public_key.clone())
                                .unwrap(),
                        ))
                    }
                },
            ));
        }

        {
            let watch_calls = watch_calls.clone();
            routing_context.watch_dht_values = Arc::new(tokio::sync::Mutex::new(
                move |key: RecordKey, _values: Option<ValueSubkeyRangeSet>, _expiration, _count| {
                    watch_calls.lock().unwrap().push(key);
                    Ok(true) // Return true instead of ()
                },
            ));
        }
        let mut conn = StubConnection::new(routing_context.clone());
        conn.require_attachment = Arc::new(tokio::sync::Mutex::new(|| Ok(())));
        conn.add_update_handler = Arc::new(std::sync::Mutex::new(|_| ()));

        let cancel = CancellationToken::new();
        let retry = Retry::default();
        let (resolver, resolver_task) =
            ShareResolver::new_task(cancel.clone(), retry, conn, index.root());

        let dht_rec = routing_context
            .create_dht_record(
                CRYPTO_KIND_VLD0,
                veilid_core::DHTSchema::DFLT(DHTSchemaDFLT::new(2).unwrap()),
                None,
            )
            .await
            .unwrap();
        let fake_key = dht_rec.key().clone();

        // Set have_map key from a created dht record. This puts the DHT record
        // in the local record table, so it appears to be "available" and the
        // connection doesn't try to go out onto the network.
        {
            let dht_rec = routing_context
                .create_dht_record(
                    CRYPTO_KIND_VLD0,
                    veilid_core::DHTSchema::DFLT(DHTSchemaDFLT::new(2).unwrap()),
                    None,
                )
                .await
                .unwrap();
            let mut have_map_key = fake_have_map_key.lock().unwrap();
            *have_map_key = Some(dht_rec.key().clone());
        }

        // Test adding a share - this should resolve to header with peer_map and have_map
        let share_info = resolver.add_share(&fake_key).await.expect("add share");

        // Verify the resolved share info
        assert_eq!(share_info.key, fake_key);
        assert_eq!(share_info.index.root(), index.root());

        // Verify the header was created correctly with peer_map and have_map
        assert_eq!(
            share_info.header.have_map().map(|m| m.key()),
            fake_have_map_key.lock().unwrap().as_ref(),
        );
        assert_eq!(
            share_info.header.peer_map().map(|m| m.key()),
            Some(&fake_peer_map_key)
        );
        assert_eq!(
            share_info.header.have_map().map(|m| m.subkeys()),
            Some(1u16)
        );
        assert_eq!(
            share_info.header.peer_map().map(|m| m.subkeys()),
            Some(1u16)
        );

        // Verify DHT calls were made
        let get_dht_calls = get_dht_calls.lock().unwrap();
        assert_eq!(get_dht_calls.len(), 3); // Header (subkey 0) and index (subkey 1), have map
        assert_eq!(get_dht_calls[0].0, fake_key);
        assert_eq!(get_dht_calls[0].1, 0); // Header subkey
        assert_eq!(get_dht_calls[1].0, fake_key);
        assert_eq!(get_dht_calls[1].1, 1); // Index subkey

        let watch_calls = watch_calls.lock().unwrap();
        assert_eq!(watch_calls.len(), 1);
        assert_eq!(watch_calls[0], fake_key);

        // Initiate a shutdown
        cancel.cancel();

        // Service run terminates with either cancelled or receive error
        resolver_task.await.unwrap().unwrap_err();
    }
}