Merge pull request #114 from richardschneider/provide-blocks

Provide blocks
richardschneider · Jun 11, 2019 · 479ad4b · 479ad4b
2 parents f5e505c + 1dd2793
commit 479ad4b
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 3 deletions.
diff --git a/src/CoreApi/BlockApi.cs b/src/CoreApi/BlockApi.cs
@@ -197,6 +197,10 @@ public async Task<Cid> PutAsync(
             else
             {
                 await Store.PutAsync(cid, block, cancel).ConfigureAwait(false);
+                if (ipfs.IsStarted)
+                {
+                    await ipfs.Dht.ProvideAsync(cid, advertise: false, cancel: cancel).ConfigureAwait(false);
+                }
                 log.DebugFormat("Added block '{0}'", cid);
             }
 

diff --git a/src/CoreApi/FileSystemApi.cs b/src/CoreApi/FileSystemApi.cs
@@ -105,11 +105,20 @@ public async Task<IFileSystemNode> AddAsync(
             {
                 var link = node.ToLink(name);
                 var wlinks = new IFileSystemLink[] { link };
-                return await CreateDirectoryAsync(wlinks, options, cancel).ConfigureAwait(false);
+                node = await CreateDirectoryAsync(wlinks, options, cancel).ConfigureAwait(false);
+            }
+            else
+            {
+                node.Name = name;
+            }
+
+            // Advertise the root node.
+            if (options.Pin && ipfs.IsStarted)
+            {
+                await ipfs.Dht.ProvideAsync(node.Id, advertise: true, cancel: cancel).ConfigureAwait(false);
             }
 
             // Return the file system node.
-            node.Name = name;
             return node;
         }
 

diff --git a/src/IpfsEngine.cs b/src/IpfsEngine.cs
@@ -328,6 +328,16 @@ void Init()
             return Cid.Decode(r.Remove(0, 6));  // strip '/ipfs/'.
         }
 
+        /// <summary>
+        ///   Determines if the engine has started.
+        /// </summary>
+        /// <value>
+        ///   <b>true</b> if the engine has started; otherwise, <b>false</b>.
+        /// </value>
+        /// <seealso cref="Start"/>
+        /// <seealso cref="StartAsync"/>
+        public bool IsStarted => stopTasks.Count > 0;
+
         /// <summary>
         ///   Starts the network services.
         /// </summary>

diff --git a/src/IpfsEngine.csproj b/src/IpfsEngine.csproj
@@ -40,7 +40,7 @@
     <PackageReference Include="Makaretu.Dns.Unicast" Version="0.10.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="Nito.AsyncEx.Coordination" Version="5.0.0" />
-    <PackageReference Include="PeerTalk" Version="0.12.0" />
+    <PackageReference Include="PeerTalk" Version="0.13.0" />
     <PackageReference Include="PeterO.Cbor" Version="3.1.0" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
     <PackageReference Include="protobuf-net" Version="2.4.0" />

diff --git a/test/CoreApi/BlockApiTest.cs b/test/CoreApi/BlockApiTest.cs
@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -238,5 +239,26 @@ public async Task Put_Informs_Bitswap()
             Assert.AreEqual(data.Length, wantTask.Result.Size);
             CollectionAssert.AreEqual(data, wantTask.Result.DataBytes);
         }
+
+        [TestMethod]
+        public async Task Put_Informs_Dht()
+        {
+            var data = Guid.NewGuid().ToByteArray();
+            var ipfs = TestFixture.Ipfs;
+            await ipfs.StartAsync();
+            try
+            {
+                var self = await ipfs.LocalPeer;
+                var cid = await ipfs.Block.PutAsync(data);
+                var cts = new CancellationTokenSource(TimeSpan.FromSeconds(3));
+                var peers = await ipfs.Dht.FindProvidersAsync(cid, limit: 1, cancel: cts.Token);
+                Assert.AreEqual(self, peers.First());
+            }
+            finally
+            {
+                await ipfs.StopAsync();
+            }
+
+        }
     }
 }
diff --git a/test/IpfsEngineTest.cs b/test/IpfsEngineTest.cs
@@ -95,9 +95,12 @@ public async Task Can_Start_And_Stop()
             var ipfs = TestFixture.Ipfs;
             var peer = await ipfs.LocalPeer;
 
+            Assert.IsFalse(ipfs.IsStarted);
             await ipfs.StartAsync();
+            Assert.IsTrue(ipfs.IsStarted);
             Assert.AreNotEqual(0, peer.Addresses.Count());
             await ipfs.StopAsync();
+            Assert.IsFalse(ipfs.IsStarted);
             Assert.AreEqual(0, peer.Addresses.Count());
 
             await ipfs.StartAsync();