Skip to content

Commit 2dd82fd

Browse files
authored
Merge branch 'dev' into feature-cleanup-by-bettercodehub-20190614
2 parents 52b7686 + 6b58ede commit 2dd82fd

File tree

8 files changed

+232
-97
lines changed

8 files changed

+232
-97
lines changed

Diff for: src/AElf.WebApp.Application.Chain/BlockChainAppService.cs

+84-47
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
namespace AElf.WebApp.Application.Chain.Dto
2+
{
3+
public class ExecuteRawTransactionDto
4+
{
5+
/// <summary>
6+
/// raw transaction
7+
/// </summary>
8+
public string RawTransaction { get; set; }
9+
10+
/// <summary>
11+
/// signature
12+
/// </summary>
13+
public string Signature { get; set; }
14+
}
15+
}

Diff for: src/AElf.WebApp.Application.Chain/Dto/BroadcastTransactionInput.cs renamed to src/AElf.WebApp.Application.Chain/Dto/ExecuteTransactionDto.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace AElf.WebApp.Application.Chain.Dto
22
{
3-
public class BroadcastTransactionInput
3+
public class ExecuteTransactionDto
44
{
55
/// <summary>
66
/// raw transaction

Diff for: src/AElf.WebApp.Application.Chain/Dto/CallInput.cs renamed to src/AElf.WebApp.Application.Chain/Dto/SendTransactionInput.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace AElf.WebApp.Application.Chain.Dto
22
{
3-
public class CallInput
3+
public class SendTransactionInput
44
{
55
/// <summary>
66
/// raw transaction

Diff for: src/AElf.WebApp.Application.Chain/Dto/BroadcastTransactionOutput.cs renamed to src/AElf.WebApp.Application.Chain/Dto/SendTransactionOutput.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace AElf.WebApp.Application.Chain.Dto
22
{
3-
public class BroadcastTransactionOutput
3+
public class SendTransactionOutput
44
{
55
public string TransactionId { get; set; }
66
}

Diff for: src/AElf.WebApp.Application.Chain/Dto/BroadcastTransactionsInput.cs renamed to src/AElf.WebApp.Application.Chain/Dto/SendTransactionsInput.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace AElf.WebApp.Application.Chain.Dto
22
{
3-
public class BroadcastTransactionsInput
3+
public class SendTransactionsInput
44
{
55
/// <summary>
66
/// raw transactions

Diff for: src/AElf.WebApp.Application.Net/NetAppService.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ namespace AElf.WebApp.Application.Net
1010
{
1111
public interface INetAppService : IApplicationService
1212
{
13-
Task<bool> AddPeer(AddPeerInput input);
13+
Task<bool> AddPeerAsync(AddPeerInput input);
1414

15-
Task<bool> RemovePeer(string address);
15+
Task<bool> RemovePeerAsync(string address);
1616

1717
List<PeerDto> GetPeers();
1818

19-
Task<GetNetworkInfoOutput> GetNetworkInfo();
19+
Task<GetNetworkInfoOutput> GetNetworkInfoAsync();
2020
}
2121

2222
public class NetAppService : INetAppService
@@ -34,7 +34,7 @@ public NetAppService(INetworkService networkService)
3434
/// Attempts to add a node to the connected network nodes
3535
/// </summary>
3636
/// <returns>true/false</returns>
37-
public async Task<bool> AddPeer(AddPeerInput input)
37+
public async Task<bool> AddPeerAsync(AddPeerInput input)
3838
{
3939
return await _networkService.AddPeerAsync(input.Address);
4040
}
@@ -44,7 +44,7 @@ public async Task<bool> AddPeer(AddPeerInput input)
4444
/// </summary>
4545
/// <param name="address">ip address</param>
4646
/// <returns></returns>
47-
public async Task<bool> RemovePeer(string address)
47+
public async Task<bool> RemovePeerAsync(string address)
4848
{
4949
return await _networkService.RemovePeerAsync(address);
5050
}
@@ -74,7 +74,7 @@ public List<PeerDto> GetPeers()
7474
/// Get information about the node’s connection to the network.
7575
/// </summary>
7676
/// <returns></returns>
77-
public Task<GetNetworkInfoOutput> GetNetworkInfo()
77+
public Task<GetNetworkInfoOutput> GetNetworkInfoAsync()
7878
{
7979
var output = new GetNetworkInfoOutput
8080
{

Diff for: test/AElf.WebApp.Application.Chain.Tests/BlockChainAppServiceTest.cs

+123-40
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)