Skip to content

Commit 429a081

Browse files
authored
Add Async to async method's name (#3206)
* Add Async * Add more
1 parent 629baf8 commit 429a081

File tree

11 files changed

+39
-39
lines changed

11 files changed

+39
-39
lines changed

src/Neo/SmartContract/ApplicationEngine.Contract.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ partial class ApplicationEngine
5454
/// The <see cref="InteropDescriptor"/> of System.Contract.NativeOnPersist.
5555
/// </summary>
5656
/// <remarks>Note: It is for internal use only. Do not use it directly in smart contracts.</remarks>
57-
public static readonly InteropDescriptor System_Contract_NativeOnPersist = Register("System.Contract.NativeOnPersist", nameof(NativeOnPersist), 0, CallFlags.States);
57+
public static readonly InteropDescriptor System_Contract_NativeOnPersist = Register("System.Contract.NativeOnPersist", nameof(NativeOnPersistAsync), 0, CallFlags.States);
5858

5959
/// <summary>
6060
/// The <see cref="InteropDescriptor"/> of System.Contract.NativePostPersist.
6161
/// </summary>
6262
/// <remarks>Note: It is for internal use only. Do not use it directly in smart contracts.</remarks>
63-
public static readonly InteropDescriptor System_Contract_NativePostPersist = Register("System.Contract.NativePostPersist", nameof(NativePostPersist), 0, CallFlags.States);
63+
public static readonly InteropDescriptor System_Contract_NativePostPersist = Register("System.Contract.NativePostPersist", nameof(NativePostPersistAsync), 0, CallFlags.States);
6464

6565
/// <summary>
6666
/// The implementation of System.Contract.Call.
@@ -145,9 +145,9 @@ internal protected UInt160 CreateMultisigAccount(int m, ECPoint[] pubKeys)
145145

146146
/// <summary>
147147
/// The implementation of System.Contract.NativeOnPersist.
148-
/// Calls to the <see cref="NativeContract.OnPersist"/> of all native contracts.
148+
/// Calls to the <see cref="NativeContract.OnPersistAsync"/> of all native contracts.
149149
/// </summary>
150-
protected internal async void NativeOnPersist()
150+
protected internal async void NativeOnPersistAsync()
151151
{
152152
try
153153
{
@@ -156,7 +156,7 @@ protected internal async void NativeOnPersist()
156156
foreach (NativeContract contract in NativeContract.Contracts)
157157
{
158158
if (contract.IsActive(ProtocolSettings, PersistingBlock.Index))
159-
await contract.OnPersist(this);
159+
await contract.OnPersistAsync(this);
160160
}
161161
}
162162
catch (Exception ex)
@@ -167,9 +167,9 @@ protected internal async void NativeOnPersist()
167167

168168
/// <summary>
169169
/// The implementation of System.Contract.NativePostPersist.
170-
/// Calls to the <see cref="NativeContract.PostPersist"/> of all native contracts.
170+
/// Calls to the <see cref="NativeContract.PostPersistAsync"/> of all native contracts.
171171
/// </summary>
172-
protected internal async void NativePostPersist()
172+
protected internal async void NativePostPersistAsync()
173173
{
174174
try
175175
{
@@ -178,7 +178,7 @@ protected internal async void NativePostPersist()
178178
foreach (NativeContract contract in NativeContract.Contracts)
179179
{
180180
if (contract.IsActive(ProtocolSettings, PersistingBlock.Index))
181-
await contract.PostPersist(this);
181+
await contract.PostPersistAsync(this);
182182
}
183183
}
184184
catch (Exception ex)

src/Neo/SmartContract/ApplicationEngine.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ private ExecutionContext CallContractInternal(ContractState contract, ContractMe
307307
return context_new;
308308
}
309309

310-
internal ContractTask CallFromNativeContract(UInt160 callingScriptHash, UInt160 hash, string method, params StackItem[] args)
310+
internal ContractTask CallFromNativeContractAsync(UInt160 callingScriptHash, UInt160 hash, string method, params StackItem[] args)
311311
{
312312
ExecutionContext context_new = CallContractInternal(hash, method, CallFlags.All, false, args);
313313
ExecutionContextState state = context_new.GetState<ExecutionContextState>();
@@ -317,7 +317,7 @@ internal ContractTask CallFromNativeContract(UInt160 callingScriptHash, UInt160
317317
return task;
318318
}
319319

320-
internal ContractTask<T> CallFromNativeContract<T>(UInt160 callingScriptHash, UInt160 hash, string method, params StackItem[] args)
320+
internal ContractTask<T> CallFromNativeContractAsync<T>(UInt160 callingScriptHash, UInt160 hash, string method, params StackItem[] args)
321321
{
322322
ExecutionContext context_new = CallContractInternal(hash, method, CallFlags.All, true, args);
323323
ExecutionContextState state = context_new.GetState<ExecutionContextState>();

src/Neo/SmartContract/Native/ContractManagement.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ private int GetNextAvailableId(DataCache snapshot)
4848
return value;
4949
}
5050

51-
internal override ContractTask Initialize(ApplicationEngine engine, Hardfork? hardfork)
51+
internal override ContractTask InitializeAsync(ApplicationEngine engine, Hardfork? hardfork)
5252
{
5353
if (hardfork == ActiveIn)
5454
{
@@ -58,15 +58,15 @@ internal override ContractTask Initialize(ApplicationEngine engine, Hardfork? ha
5858
return ContractTask.CompletedTask;
5959
}
6060

61-
private async ContractTask OnDeploy(ApplicationEngine engine, ContractState contract, StackItem data, bool update)
61+
private async ContractTask OnDeployAsync(ApplicationEngine engine, ContractState contract, StackItem data, bool update)
6262
{
6363
ContractMethodDescriptor md = contract.Manifest.Abi.GetMethod("_deploy", 2);
6464
if (md is not null)
65-
await engine.CallFromNativeContract(Hash, contract.Hash, md.Name, data, update);
65+
await engine.CallFromNativeContractAsync(Hash, contract.Hash, md.Name, data, update);
6666
engine.SendNotification(Hash, update ? "Update" : "Deploy", new VM.Types.Array(engine.ReferenceCounter) { contract.Hash.ToArray() });
6767
}
6868

69-
internal override async ContractTask OnPersist(ApplicationEngine engine)
69+
internal override async ContractTask OnPersistAsync(ApplicationEngine engine)
7070
{
7171
foreach (NativeContract contract in Contracts)
7272
{
@@ -92,7 +92,7 @@ internal override async ContractTask OnPersist(ApplicationEngine engine)
9292
oldContract.Manifest = contractState.Manifest;
9393
}
9494

95-
await contract.Initialize(engine, hf);
95+
await contract.InitializeAsync(engine, hf);
9696
// Emit native contract notification
9797
engine.SendNotification(Hash, state is null ? "Deploy" : "Update", new VM.Types.Array(engine.ReferenceCounter) { contract.Hash.ToArray() });
9898
}
@@ -232,7 +232,7 @@ private async ContractTask<ContractState> Deploy(ApplicationEngine engine, byte[
232232
engine.Snapshot.Add(key, new StorageItem(contract));
233233
engine.Snapshot.Add(CreateStorageKey(Prefix_ContractHash).AddBigEndian(contract.Id), new StorageItem(hash.ToArray()));
234234

235-
await OnDeploy(engine, contract, data, false);
235+
await OnDeployAsync(engine, contract, data, false);
236236

237237
return contract;
238238
}
@@ -275,7 +275,7 @@ private ContractTask Update(ApplicationEngine engine, byte[] nefFile, byte[] man
275275
}
276276
Helper.Check(new VM.Script(contract.Nef.Script, engine.IsHardforkEnabled(Hardfork.HF_Basilisk)), contract.Manifest.Abi);
277277
contract.UpdateCounter++; // Increase update counter
278-
return OnDeploy(engine, contract, data, true);
278+
return OnDeployAsync(engine, contract, data, true);
279279
}
280280

281281
[ContractMethod(CpuFee = 1 << 15, RequiredCallFlags = CallFlags.States | CallFlags.AllowNotify)]

src/Neo/SmartContract/Native/FungibleToken.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ internal async ContractTask Mint(ApplicationEngine engine, UInt160 account, BigI
8080
state.Balance += amount;
8181
storage = engine.Snapshot.GetAndChange(CreateStorageKey(Prefix_TotalSupply), () => new StorageItem(BigInteger.Zero));
8282
storage.Add(amount);
83-
await PostTransfer(engine, null, account, amount, StackItem.Null, callOnPayment);
83+
await PostTransferAsync(engine, null, account, amount, StackItem.Null, callOnPayment);
8484
}
8585

8686
internal async ContractTask Burn(ApplicationEngine engine, UInt160 account, BigInteger amount)
@@ -98,7 +98,7 @@ internal async ContractTask Burn(ApplicationEngine engine, UInt160 account, BigI
9898
state.Balance -= amount;
9999
storage = engine.Snapshot.GetAndChange(CreateStorageKey(Prefix_TotalSupply));
100100
storage.Add(-amount);
101-
await PostTransfer(engine, account, null, amount, StackItem.Null, false);
101+
await PostTransferAsync(engine, account, null, amount, StackItem.Null, false);
102102
}
103103

104104
/// <summary>
@@ -169,15 +169,15 @@ private protected async ContractTask<bool> Transfer(ApplicationEngine engine, UI
169169
state_to.Balance += amount;
170170
}
171171
}
172-
await PostTransfer(engine, from, to, amount, data, true);
172+
await PostTransferAsync(engine, from, to, amount, data, true);
173173
return true;
174174
}
175175

176176
internal virtual void OnBalanceChanging(ApplicationEngine engine, UInt160 account, TState state, BigInteger amount)
177177
{
178178
}
179179

180-
private protected virtual async ContractTask PostTransfer(ApplicationEngine engine, UInt160 from, UInt160 to, BigInteger amount, StackItem data, bool callOnPayment)
180+
private protected virtual async ContractTask PostTransferAsync(ApplicationEngine engine, UInt160 from, UInt160 to, BigInteger amount, StackItem data, bool callOnPayment)
181181
{
182182
// Send notification
183183

@@ -190,7 +190,7 @@ private protected virtual async ContractTask PostTransfer(ApplicationEngine engi
190190

191191
// Call onNEP17Payment method
192192

193-
await engine.CallFromNativeContract(Hash, to, "onNEP17Payment", from?.ToArray() ?? StackItem.Null, amount, data);
193+
await engine.CallFromNativeContractAsync(Hash, to, "onNEP17Payment", from?.ToArray() ?? StackItem.Null, amount, data);
194194
}
195195
}
196196
}

src/Neo/SmartContract/Native/GasToken.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ internal GasToken()
2626
{
2727
}
2828

29-
internal override ContractTask Initialize(ApplicationEngine engine, Hardfork? hardfork)
29+
internal override ContractTask InitializeAsync(ApplicationEngine engine, Hardfork? hardfork)
3030
{
3131
if (hardfork == ActiveIn)
3232
{
@@ -36,7 +36,7 @@ internal override ContractTask Initialize(ApplicationEngine engine, Hardfork? ha
3636
return ContractTask.CompletedTask;
3737
}
3838

39-
internal override async ContractTask OnPersist(ApplicationEngine engine)
39+
internal override async ContractTask OnPersistAsync(ApplicationEngine engine)
4040
{
4141
long totalNetworkFee = 0;
4242
foreach (Transaction tx in engine.PersistingBlock.Transactions)

src/Neo/SmartContract/Native/LedgerContract.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public sealed class LedgerContract : NativeContract
3434

3535
internal LedgerContract() : base() { }
3636

37-
internal override ContractTask OnPersist(ApplicationEngine engine)
37+
internal override ContractTask OnPersistAsync(ApplicationEngine engine)
3838
{
3939
TransactionState[] transactions = engine.PersistingBlock.Transactions.Select(p => new TransactionState
4040
{
@@ -65,7 +65,7 @@ internal override ContractTask OnPersist(ApplicationEngine engine)
6565
return ContractTask.CompletedTask;
6666
}
6767

68-
internal override ContractTask PostPersist(ApplicationEngine engine)
68+
internal override ContractTask PostPersistAsync(ApplicationEngine engine)
6969
{
7070
HashIndexState state = engine.Snapshot.GetAndChange(CreateStorageKey(Prefix_CurrentBlock), () => new StorageItem(new HashIndexState())).GetInteroperable<HashIndexState>();
7171
state.Hash = engine.PersistingBlock.Hash;

src/Neo/SmartContract/Native/NativeContract.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,17 +398,17 @@ public static bool IsNative(UInt160 hash)
398398
return contractsDictionary.ContainsKey(hash);
399399
}
400400

401-
internal virtual ContractTask Initialize(ApplicationEngine engine, Hardfork? hardFork)
401+
internal virtual ContractTask InitializeAsync(ApplicationEngine engine, Hardfork? hardFork)
402402
{
403403
return ContractTask.CompletedTask;
404404
}
405405

406-
internal virtual ContractTask OnPersist(ApplicationEngine engine)
406+
internal virtual ContractTask OnPersistAsync(ApplicationEngine engine)
407407
{
408408
return ContractTask.CompletedTask;
409409
}
410410

411-
internal virtual ContractTask PostPersist(ApplicationEngine engine)
411+
internal virtual ContractTask PostPersistAsync(ApplicationEngine engine)
412412
{
413413
return ContractTask.CompletedTask;
414414
}

src/Neo/SmartContract/Native/NeoToken.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ internal override void OnBalanceChanging(ApplicationEngine engine, UInt160 accou
9393
CheckCandidate(engine.Snapshot, state.VoteTo, candidate);
9494
}
9595

96-
private protected override async ContractTask PostTransfer(ApplicationEngine engine, UInt160 from, UInt160 to, BigInteger amount, StackItem data, bool callOnPayment)
96+
private protected override async ContractTask PostTransferAsync(ApplicationEngine engine, UInt160 from, UInt160 to, BigInteger amount, StackItem data, bool callOnPayment)
9797
{
98-
await base.PostTransfer(engine, from, to, amount, data, callOnPayment);
98+
await base.PostTransferAsync(engine, from, to, amount, data, callOnPayment);
9999
var list = engine.CurrentContext.GetState<List<GasDistribution>>();
100100
foreach (var distribution in list)
101101
await GAS.Mint(engine, distribution.Account, distribution.Amount, callOnPayment);
@@ -176,7 +176,7 @@ private void CheckCandidate(DataCache snapshot, ECPoint pubkey, CandidateState c
176176
/// <returns><see langword="true"/> if the votes should be recounted; otherwise, <see langword="false"/>.</returns>
177177
public static bool ShouldRefreshCommittee(uint height, int committeeMembersCount) => height % committeeMembersCount == 0;
178178

179-
internal override ContractTask Initialize(ApplicationEngine engine, Hardfork? hardfork)
179+
internal override ContractTask InitializeAsync(ApplicationEngine engine, Hardfork? hardfork)
180180
{
181181
if (hardfork == ActiveIn)
182182
{
@@ -190,7 +190,7 @@ internal override ContractTask Initialize(ApplicationEngine engine, Hardfork? ha
190190
return ContractTask.CompletedTask;
191191
}
192192

193-
internal override ContractTask OnPersist(ApplicationEngine engine)
193+
internal override ContractTask OnPersistAsync(ApplicationEngine engine)
194194
{
195195
// Set next committee
196196
if (ShouldRefreshCommittee(engine.PersistingBlock.Index, engine.ProtocolSettings.CommitteeMembersCount))
@@ -216,7 +216,7 @@ internal override ContractTask OnPersist(ApplicationEngine engine)
216216
return ContractTask.CompletedTask;
217217
}
218218

219-
internal override async ContractTask PostPersist(ApplicationEngine engine)
219+
internal override async ContractTask PostPersistAsync(ApplicationEngine engine)
220220
{
221221
// Distribute GAS for committee
222222

src/Neo/SmartContract/Native/OracleContract.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private ContractTask Finish(ApplicationEngine engine)
8282
if (request == null) throw new ArgumentException("Oracle request was not found");
8383
engine.SendNotification(Hash, "OracleResponse", new VM.Types.Array(engine.ReferenceCounter) { response.Id, request.OriginalTxid.ToArray() });
8484
StackItem userData = BinarySerializer.Deserialize(request.UserData, engine.Limits, engine.ReferenceCounter);
85-
return engine.CallFromNativeContract(Hash, request.CallbackContract, request.CallbackMethod, request.Url, userData, (int)response.Code, response.Result);
85+
return engine.CallFromNativeContractAsync(Hash, request.CallbackContract, request.CallbackMethod, request.Url, userData, (int)response.Code, response.Result);
8686
}
8787

8888
private UInt256 GetOriginalTxid(ApplicationEngine engine)
@@ -134,7 +134,7 @@ private static byte[] GetUrlHash(string url)
134134
return Crypto.Hash160(Utility.StrictUTF8.GetBytes(url));
135135
}
136136

137-
internal override ContractTask Initialize(ApplicationEngine engine, Hardfork? hardfork)
137+
internal override ContractTask InitializeAsync(ApplicationEngine engine, Hardfork? hardfork)
138138
{
139139
if (hardfork == ActiveIn)
140140
{
@@ -144,7 +144,7 @@ internal override ContractTask Initialize(ApplicationEngine engine, Hardfork? ha
144144
return ContractTask.CompletedTask;
145145
}
146146

147-
internal override async ContractTask PostPersist(ApplicationEngine engine)
147+
internal override async ContractTask PostPersistAsync(ApplicationEngine engine)
148148
{
149149
(UInt160 Account, BigInteger GAS)[] nodes = null;
150150
foreach (Transaction tx in engine.PersistingBlock.Transactions)

src/Neo/SmartContract/Native/PolicyContract.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public sealed class PolicyContract : NativeContract
6666

6767
internal PolicyContract() : base() { }
6868

69-
internal override ContractTask Initialize(ApplicationEngine engine, Hardfork? hardfork)
69+
internal override ContractTask InitializeAsync(ApplicationEngine engine, Hardfork? hardfork)
7070
{
7171
if (hardfork == ActiveIn)
7272
{

0 commit comments

Comments
 (0)