Skip to content

Commit 0ec2e62

Browse files
fix(IDataBlock): do not serialize DataStream
1 parent 14c067e commit 0ec2e62

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

src/Block.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,24 @@
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
5+
using System.Runtime.Serialization;
56
using System.Text;
67
using System.Threading.Tasks;
78

89
namespace Ipfs.Api
910
{
1011
/// <inheritdoc />
12+
[DataContract]
1113
public class Block : IDataBlock
1214
{
1315
long? size;
1416

1517
/// <inheritdoc />
18+
[DataMember]
1619
public Cid Id { get; set; }
1720

1821
/// <inheritdoc />
22+
[DataMember]
1923
public byte[] DataBytes { get; set; }
2024

2125
/// <inheritdoc />
@@ -28,6 +32,7 @@ public Stream DataStream
2832
}
2933

3034
/// <inheritdoc />
35+
[DataMember]
3136
public long Size
3237
{
3338
get

src/MerkleNode.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Text;
55
using Newtonsoft.Json.Linq;
66
using System.IO;
7+
using System.Runtime.Serialization;
78

89
namespace Ipfs.Api
910
{
@@ -13,6 +14,7 @@ namespace Ipfs.Api
1314
/// <remarks>
1415
/// Initially an <b>MerkleNode</b> is just constructed with its Cid.
1516
/// </remarks>
17+
[DataContract]
1618
public class MerkleNode : IMerkleNode<IMerkleLink>, IEquatable<MerkleNode>
1719
{
1820
bool hasBlockStats;
@@ -91,11 +93,13 @@ internal IpfsClient IpfsClient
9193
}
9294

9395
/// <inheritdoc />
96+
[DataMember]
9497
public Cid Id { get; private set; }
9598

9699
/// <summary>
97100
/// The name for the node. If unknown it is "" (not null).
98101
/// </summary>
102+
[DataMember]
99103
public string Name
100104
{
101105
get { return name; }
@@ -105,6 +109,7 @@ public string Name
105109
/// <summary>
106110
/// Size of the raw, encoded node.
107111
/// </summary>
112+
[DataMember]
108113
public long BlockSize
109114
{
110115
get
@@ -116,6 +121,7 @@ public long BlockSize
116121

117122
/// <inheritdoc />
118123
/// <seealso cref="BlockSize"/>
124+
[DataMember]
119125
public long Size
120126
{
121127
get
@@ -126,6 +132,7 @@ public long Size
126132

127133

128134
/// <inheritdoc />
135+
[DataMember]
129136
public IEnumerable<IMerkleLink> Links
130137
{
131138
get
@@ -140,6 +147,7 @@ public IEnumerable<IMerkleLink> Links
140147
}
141148

142149
/// <inheritdoc />
150+
[DataMember]
143151
public byte[] DataBytes
144152
{
145153
get

src/PublishedMessage.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Linq;
55
using System.IO;
66
using System.Text;
7+
using System.Runtime.Serialization;
78

89
namespace Ipfs.Api
910
{
@@ -13,6 +14,7 @@ namespace Ipfs.Api
1314
/// <remarks>
1415
/// The <see cref="PubSubApi"/> is used to publish and subsribe to a message.
1516
/// </remarks>
17+
[DataContract]
1618
public class PublishedMessage : IPublishedMessage
1719
{
1820
/// <summary>
@@ -33,15 +35,19 @@ public PublishedMessage(string json)
3335
}
3436

3537
/// <inheritdoc />
38+
[DataMember]
3639
public Peer Sender { get; private set; }
3740

3841
/// <inheritdoc />
42+
[DataMember]
3943
public IEnumerable<string> Topics { get; private set; }
4044

4145
/// <inheritdoc />
46+
[DataMember]
4247
public byte[] SequenceNumber { get; private set; }
4348

4449
/// <inheritdoc />
50+
[DataMember]
4551
public byte[] DataBytes { get; private set; }
4652

4753
/// <inheritdoc />
@@ -54,6 +60,7 @@ public Stream DataStream
5460
}
5561

5662
/// <inheritdoc />
63+
[DataMember]
5764
public long Size
5865
{
5966
get { return DataBytes.Length; }

0 commit comments

Comments
 (0)