attempting to fix a regression in HistorySynchornizer

Author: sbazerque

src/mesh/agents/state/history/HistorySynchronizer.ts

@@ -893,8 +893,6 @@ class HistorySynchronizer {
 
             }
 
-            
-
             reqInfo.status = 'accepted-response';
 
             await this.attemptToProcessLiterals(reqInfo);
@@ -968,6 +966,9 @@ class HistorySynchronizer {
 
                     reqInfo.nextOpSequence = reqInfo.nextOpSequence as number + 1;
 
+                    await this.syncAgent.store.save(this.syncAgent.mutableObj); // Since we provided this obj to the context,
+                                                                                // the store is gonna believe that it was already
+                                                                                // saved, which may not be the actual case.
                     await this.syncAgent.store.saveWithContext(literal.hash, reqInfo.receivedObjects as Context);
 
                     // FIXME: there's no validation of the op matching the actual causal history op

test/mesh/agents/state.test.ts

@@ -224,7 +224,7 @@ async function syncInSmallPeerGroup(done: () => void, network: 'wrtc'|'ws'|'mix'
         const peerGroupAgent = pods[i].getAgent(PeerGroupAgent.agentIdForPeerGroup(peerNetworkId)) as PeerGroupAgent;
 
         //let agent = new TerminalOpsSyncAgent(peerGroupAgent, s.hash(), stores[i], MutableSet.opClasses);
-        let agent = new HeaderBasedSyncAgent(peerGroupAgent, s.hash(),  await Resources.create({store: stores[i]}), MutableSet.opClasses);
+        let agent = new HeaderBasedSyncAgent(peerGroupAgent, s.clone(),  await Resources.create({store: stores[i]}), MutableSet.opClasses);
         let gossip = pods[i].getAgent(StateGossipAgent.agentIdForGossip(peerNetworkId)) as StateGossipAgent;
         gossip.trackAgentState(agent.getAgentId());
         //agent;
@@ -358,7 +358,7 @@ async function stagedSyncInSmallPeerGroup(done: () => void, network: 'wrtc'|'ws'
     for (let i=0; i<size; i++) {
         const meshAgent = pods[i].getAgent(PeerGroupAgent.agentIdForPeerGroup(peerNetworkId)) as PeerGroupAgent;
         //let agent = new TerminalOpsSyncAgent(meshAgent, s.hash(), stores[i], MutableSet.opClasses);
-        let agent = new HeaderBasedSyncAgent(meshAgent, s.hash(), await Resources.create({store: stores[i]}), MutableSet.opClasses);
+        let agent = new HeaderBasedSyncAgent(meshAgent, s.clone(), await Resources.create({store: stores[i]}), MutableSet.opClasses);
         let gossip = pods[i].getAgent(StateGossipAgent.agentIdForGossip(peerNetworkId)) as StateGossipAgent;
         gossip.trackAgentState(agent.getAgentId());
         //agent;
@@ -525,7 +525,7 @@ async function deepSyncInSmallPeerGroup(done: () => void, network: 'wrtc'|'ws'|'
     for (let i=0; i<size; i++) {
         const meshAgent = pods[i].getAgent(PeerGroupAgent.agentIdForPeerGroup(peerNetworkId)) as PeerGroupAgent;
         //let agent = new TerminalOpsSyncAgent(meshAgent, s.hash(), stores[i], MutableSet.opClasses);
-        let agent = new HeaderBasedSyncAgent(meshAgent, s.hash(), await Resources.create({store: stores[i]}), MutableSet.opClasses);
+        let agent = new HeaderBasedSyncAgent(meshAgent, s.clone(), await Resources.create({store: stores[i]}), MutableSet.opClasses);
         if (i===0) {
 
             //syncAgent = agent;
@@ -739,7 +739,7 @@ async function diamondSyncInSmallPeerGroup(done: () => void, network: 'wrtc'|'ws
     for (let i=0; i<size; i++) {
         const meshAgent = pods[i].getAgent(PeerGroupAgent.agentIdForPeerGroup(peerNetworkId)) as PeerGroupAgent;
         //let agent = new TerminalOpsSyncAgent(meshAgent, s.hash(), stores[i], MutableSet.opClasses);
-        let agent = new HeaderBasedSyncAgent(meshAgent, s.hash(), await Resources.create({store: stores[i]}), MutableSet.opClasses);
+        let agent = new HeaderBasedSyncAgent(meshAgent, s.clone(), await Resources.create({store: stores[i]}), MutableSet.opClasses);
 
         agent.synchronizer.controlLog = new Logger('synchronizer', LogLevel.INFO);
         agent.synchronizer.stateLog   = new Logger('synchronizer', LogLevel.INFO);

test/storage/undo.test.ts

@@ -237,7 +237,7 @@ async function testBasicUndoCycleWithSync(stores: Store[]) {
         const peerGroupAgent = pods[i].getAgent(PeerGroupAgent.agentIdForPeerGroup(peerNetworkId)) as PeerGroupAgent;
 
         //let agent = new TerminalOpsSyncAgent(peerGroupAgent, s.hash(), stores[i], MutableSet.opClasses);
-        let agent = new HeaderBasedSyncAgent(peerGroupAgent, permissions.hash(),  await Resources.create({store: stores[i]}), permissions.getAcceptedMutationOpClasses());
+        let agent = new HeaderBasedSyncAgent(peerGroupAgent, permissions.clone(), await Resources.create({store: stores[i]}), permissions.getAcceptedMutationOpClasses());
         let gossip = pods[i].getAgent(StateGossipAgent.agentIdForGossip(peerNetworkId)) as StateGossipAgent;
         gossip.trackAgentState(agent.getAgentId());
         //agent;
@@ -455,7 +455,7 @@ async function testMultiObjectUndoCascadeWithSync(stores: Store[]) {
         const peerGroupAgent = pods[i].getAgent(PeerGroupAgent.agentIdForPeerGroup(peerNetworkId)) as PeerGroupAgent;
 
         //let agent = new TerminalOpsSyncAgent(peerGroupAgent, s.hash(), stores[i], MutableSet.opClasses);
-        let agent = new HeaderBasedSyncAgent(peerGroupAgent, features.hash(),  await Resources.create({store: stores[i]}), features.getAcceptedMutationOpClasses());
+        let agent = new HeaderBasedSyncAgent(peerGroupAgent, features.clone(),  await Resources.create({store: stores[i]}), features.getAcceptedMutationOpClasses());
         let gossip = pods[i].getAgent(StateGossipAgent.agentIdForGossip(peerNetworkId)) as StateGossipAgent;
         gossip.trackAgentState(agent.getAgentId());
         //agent;