Skip to content

Commit

Permalink
Merge pull request #2288 from planetarium/release/1.6.0
Browse files Browse the repository at this point in the history
Release/1.6.0
  • Loading branch information
ipdae authored Dec 11, 2023
2 parents 8df9184 + 4ffef62 commit 06ccead
Show file tree
Hide file tree
Showing 375 changed files with 7,410 additions and 2,597 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ public void Execute_Success(
equipments.Add((row.ResultEquipmentId, data.level));
}
}
var agentAddr = new PrivateKey().ToAddress();
var agentAddr = new PrivateKey().Address;
Execute(
_initialStates,
blockIndex,
Expand Down Expand Up @@ -405,7 +405,7 @@ public void Execute_Failure(
(int runeId, int level)[]? runes,
(int stageId, int[] crystalRandomBuffIds)? crystalRandomBuff)
{
var agentAddr = new PrivateKey().ToAddress();
var agentAddr = new PrivateKey().Address;
Assert.Throws<ArgumentException>(() => Execute(
_initialStates,
blockIndex,
Expand Down Expand Up @@ -460,7 +460,6 @@ private static void Execute(
PreviousState = previousStates,
Signer = agentAddr,
RandomSeed = 0,
Rehearsal = false,
BlockIndex = blockIndex,
});
var agent = new AgentState((Dictionary)nextStates.GetState(agentAddr)!);
Expand Down
2 changes: 1 addition & 1 deletion .Lib9c.DevExtensions.Tests/Action/FaucetCurrencyTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public FaucetCurrencyTest(ITestOutputHelper outputHelper)
.AddBalance(GoldCurrencyState.Address, _ncg * int.MaxValue));

var goldCurrencyState = new GoldCurrencyState(_ncg);
_agentAddress = new PrivateKey().ToAddress();
_agentAddress = new PrivateKey().Address;
var agentState = new AgentState(_agentAddress);

_initialState = _initialState
Expand Down
6 changes: 3 additions & 3 deletions .Lib9c.DevExtensions.Tests/Action/FaucetRuneTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,16 @@ public FaucetRuneTest(ITestOutputHelper outputHelper)
var tableSheets = new TableSheets(sheets);
_runeSheet = _initialState.GetSheet<RuneSheet>();

Address agentAddress = new PrivateKey().ToAddress();
_avatarAddress = new PrivateKey().ToAddress();
Address agentAddress = new PrivateKey().Address;
_avatarAddress = new PrivateKey().Address;
var agentState = new AgentState(agentAddress);
var avatarState = new AvatarState(
_avatarAddress,
agentAddress,
0,
tableSheets.GetAvatarSheets(),
new GameConfigState(sheets[nameof(GameConfigSheet)]),
new PrivateKey().ToAddress()
new PrivateKey().Address
);
agentState.avatarAddresses.Add(0, _avatarAddress);

Expand Down
16 changes: 8 additions & 8 deletions .Lib9c.DevExtensions.Tests/Action/ManipulateStateTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Lib9c.DevExtensions.Tests.Action
{
public class ManipulateStateTest
{
private static readonly Address AdminAddr = new PrivateKey().ToAddress();
private static readonly Address AdminAddr = new PrivateKey().Address;

// See also InitializeUtil.cs
private static readonly Currency Ncg = Currency.Legacy(
Expand Down Expand Up @@ -305,37 +305,37 @@ public static IEnumerable<object[]> FetchBalance()
{
yield return new object[]
{
new PrivateKey().ToAddress(),
new PrivateKey().Address,
new FungibleAssetValue(Ncg, 0, 1),
};
yield return new object[]
{
new PrivateKey().ToAddress(),
new PrivateKey().Address,
new FungibleAssetValue(Ncg, 1, 0),
};
yield return new object[]
{
new PrivateKey().ToAddress(),
new PrivateKey().Address,
new FungibleAssetValue(Ncg, 1_000_000_000 - 1, 99),
};
yield return new object[]
{
new PrivateKey().ToAddress(),
new PrivateKey().Address,
new FungibleAssetValue(Ncg, 1_000_000_000, 0),
};
yield return new object[]
{
new PrivateKey().ToAddress(),
new PrivateKey().Address,
new FungibleAssetValue(Crystal, 0, 1),
};
yield return new object[]
{
new PrivateKey().ToAddress(),
new PrivateKey().Address,
new FungibleAssetValue(Crystal, 1, 0),
};
yield return new object[]
{
new PrivateKey().ToAddress(),
new PrivateKey().Address,
new FungibleAssetValue(
Crystal,
long.MaxValue,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ private class DailyReward : IAction

public void LoadPlainValue(IValue plainValue)
{
AvatarAddress = new Address(((Binary)((Dictionary)plainValue)["a"]).ByteArray);
AvatarAddress = new Address(((Dictionary)plainValue)["a"]);
}

public IAccount Execute(IActionContext context)
Expand Down
9 changes: 0 additions & 9 deletions .Lib9c.StateService.Shared/Lib9c.StateService.Shared.csproj

This file was deleted.

8 changes: 0 additions & 8 deletions .Lib9c.StateService.Shared/RemoteEvaluationRequest.cs

This file was deleted.

6 changes: 0 additions & 6 deletions .Lib9c.StateService.Shared/RemoteEvaluationResponse.cs

This file was deleted.

62 changes: 0 additions & 62 deletions .Lib9c.StateService/Controllers/RemoteEvaluationController.cs

This file was deleted.

21 changes: 0 additions & 21 deletions .Lib9c.StateService/Lib9c.StateService.csproj

This file was deleted.

39 changes: 0 additions & 39 deletions .Lib9c.StateService/Program.cs

This file was deleted.

41 changes: 0 additions & 41 deletions .Lib9c.StateService/Properties/launchSettings.json

This file was deleted.

11 changes: 0 additions & 11 deletions .Lib9c.StateService/appsettings-schema.json

This file was deleted.

8 changes: 0 additions & 8 deletions .Lib9c.StateService/appsettings.Development.json

This file was deleted.

10 changes: 0 additions & 10 deletions .Lib9c.StateService/appsettings.json

This file was deleted.

Loading

0 comments on commit 06ccead

Please sign in to comment.