Test fixes

Author: ReubenBond

src/Orleans.Runtime/GrainDirectory/DhtGrainLocator.cs

@@ -28,7 +28,7 @@ public DhtGrainLocator(
 
         public async ValueTask<GrainAddress> Lookup(GrainId grainId) => (await _localGrainDirectory.LookupAsync(grainId)).Address;
 
-        public async Task<GrainAddress> Register(GrainAddress address, GrainAddress previousAddress) => (await _localGrainDirectory.RegisterAsync(address, currentRegistration: previousAddress)).Address;
+        public async Task<GrainAddress> Register(GrainAddress address, GrainAddress previousAddress) => (await _localGrainDirectory.RegisterAsync(address, previousAddress, hopCount: 0)).Address;
 
         public Task Unregister(GrainAddress address, UnregistrationCause cause)
         {
@@ -132,7 +132,7 @@ private async Task ProcessDeregistrationQueue()
 
                         if (operations.Count > 0)
                         {
-                            await _localGrainDirectory.UnregisterManyAsync(addresses, _cause);
+                            await _localGrainDirectory.UnregisterManyAsync(addresses, _cause, hopCount: 0);
                             foreach (var op in operations)
                             {
                                 op.TrySetResult(true);

src/Orleans.Runtime/GrainDirectory/ILocalGrainDirectory.cs

@@ -18,9 +18,6 @@ internal interface ILocalGrainDirectory : IDhtGrainDirectory
         /// </summary>
         Task StopAsync();
 
-        RemoteGrainDirectory RemoteGrainDirectory { get; }
-        RemoteGrainDirectory CacheValidator { get; }
-
         /// <summary>
         /// Removes the record for an non-existing activation from the directory service.
         /// This is used when a request is received for an activation that cannot be found, 

test/Grains/TestInternalGrains/TestGrain.cs

@@ -218,7 +218,6 @@ internal class OneWayGrain : Grain, IOneWayGrain, ISimpleGrainObserver
 
         public OneWayGrain(GrainLocator grainLocator) => this.grainLocator = grainLocator;
 
-        private ILocalGrainDirectory LocalGrainDirectory => this.ServiceProvider.GetRequiredService<ILocalGrainDirectory>();
         private ILocalSiloDetails LocalSiloDetails => this.ServiceProvider.GetRequiredService<ILocalSiloDetails>();
 
         public Task Notify()
@@ -325,8 +324,8 @@ public Task<SiloAddress> GetSiloAddress()
 
         public Task<SiloAddress> GetPrimaryForGrain()
         {
-            var grainId = (GrainId)this.GrainId;
-            var primaryForGrain = this.LocalGrainDirectory.GetPrimaryForGrain(grainId);
+            var directory = (DistributedGrainDirectory.ITestHooks)ServiceProvider.GetRequiredService<DistributedGrainDirectory>();
+            var primaryForGrain = directory.GetPrimaryForGrain(GrainId);
             return Task.FromResult(primaryForGrain);
         }