Skip to content

Commit

Permalink
Merge branch 'development' into release/1.5.0-to-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
ipdae authored Nov 21, 2023
2 parents cd2cefb + 3cf33bb commit dbd6e96
Show file tree
Hide file tree
Showing 176 changed files with 55 additions and 618 deletions.
Original file line number Diff line number Diff line change
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
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
2 changes: 1 addition & 1 deletion .Lib9c.Tests/Action/ActionContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class ActionContext : IActionContext

public int BlockProtocolVersion { get; set; }

public bool Rehearsal { get; set; }
public bool Rehearsal => false;

public IAccount PreviousState { get; set; }

Expand Down
3 changes: 0 additions & 3 deletions .Lib9c.Tests/Action/BattleArena10Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,6 @@ public void ExecuteDuplicatedException(int slotIndex, int runeId, int slotIndex2
PreviousState = previousStates,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
}));
}
Expand Down Expand Up @@ -1205,7 +1204,6 @@ private void Execute(
PreviousState = previousStates,
Signer = myAgentAddress,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down Expand Up @@ -1310,7 +1308,6 @@ private IAccount JoinArena(
PreviousState = states,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return states;
Expand Down
3 changes: 0 additions & 3 deletions .Lib9c.Tests/Action/BattleArena11Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,6 @@ public void ExecuteDuplicatedException(int slotIndex, int runeId, int slotIndex2
PreviousState = previousStates,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
}));
}
Expand Down Expand Up @@ -1205,7 +1204,6 @@ private void Execute(
PreviousState = previousStates,
Signer = myAgentAddress,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down Expand Up @@ -1310,7 +1308,6 @@ private IAccount JoinArena(
PreviousState = states,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return states;
Expand Down
3 changes: 0 additions & 3 deletions .Lib9c.Tests/Action/BattleArena12Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,6 @@ public void ExecuteDuplicatedException(int slotIndex, int runeId, int slotIndex2
PreviousState = previousStates,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
}));
}
Expand Down Expand Up @@ -1244,7 +1243,6 @@ private void Execute(
PreviousState = previousStates,
Signer = myAgentAddress,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down Expand Up @@ -1349,7 +1347,6 @@ private IAccount JoinArena(
PreviousState = states,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return states;
Expand Down
3 changes: 0 additions & 3 deletions .Lib9c.Tests/Action/BattleArena13Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,6 @@ public void ExecuteDuplicatedException(int slotIndex, int runeId, int slotIndex2
PreviousState = previousStates,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
}));
}
Expand Down Expand Up @@ -1205,7 +1204,6 @@ private void Execute(
PreviousState = previousStates,
Signer = myAgentAddress,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down Expand Up @@ -1310,7 +1308,6 @@ private IAccount JoinArena(
PreviousState = states,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return states;
Expand Down
2 changes: 0 additions & 2 deletions .Lib9c.Tests/Action/BattleArena1Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ public IAccount JoinArena(IActionContext context, Address signer, Address avatar
PreviousState = _state,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return _state;
Expand Down Expand Up @@ -293,7 +292,6 @@ public void Execute(long nextBlockIndex, int championshipId, int round, int tick
PreviousState = _state,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down
2 changes: 0 additions & 2 deletions .Lib9c.Tests/Action/BattleArena2Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ public IAccount JoinArena(IActionContext context, Address signer, Address avatar
PreviousState = _state,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return _state;
Expand Down Expand Up @@ -308,7 +307,6 @@ public void Execute(
PreviousState = _state,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down
2 changes: 0 additions & 2 deletions .Lib9c.Tests/Action/BattleArena3Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ public IAccount JoinArena(IActionContext context, Address signer, Address avatar
PreviousState = _state,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return _state;
Expand Down Expand Up @@ -308,7 +307,6 @@ public void Execute(
PreviousState = _state,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down
3 changes: 0 additions & 3 deletions .Lib9c.Tests/Action/BattleArena4Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,6 @@ public IAccount JoinArena(IActionContext context, Address signer, Address avatar
PreviousState = _state,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return _state;
Expand Down Expand Up @@ -308,7 +307,6 @@ public void Execute(
PreviousState = _state,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down Expand Up @@ -927,7 +925,6 @@ public void Execute_v100291()
PreviousState = _state,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down
2 changes: 0 additions & 2 deletions .Lib9c.Tests/Action/BattleArena5Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,6 @@ private void Execute(
PreviousState = previousStates,
Signer = myAgentAddress,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down Expand Up @@ -1001,7 +1000,6 @@ private IAccount JoinArena(
PreviousState = states,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return states;
Expand Down
2 changes: 0 additions & 2 deletions .Lib9c.Tests/Action/BattleArena6Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,6 @@ private void Execute(
PreviousState = previousStates,
Signer = myAgentAddress,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down Expand Up @@ -1087,7 +1086,6 @@ private IAccount JoinArena(
PreviousState = states,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return states;
Expand Down
2 changes: 0 additions & 2 deletions .Lib9c.Tests/Action/BattleArena7Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,6 @@ private void Execute(
PreviousState = previousStates,
Signer = myAgentAddress,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down Expand Up @@ -1100,7 +1099,6 @@ private IAccount JoinArena(
PreviousState = states,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return states;
Expand Down
3 changes: 0 additions & 3 deletions .Lib9c.Tests/Action/BattleArena8Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,6 @@ public void ExecuteDuplicatedException(int slotIndex, int runeId, int slotIndex2
PreviousState = previousStates,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
}));
}
Expand Down Expand Up @@ -1205,7 +1204,6 @@ private void Execute(
PreviousState = previousStates,
Signer = myAgentAddress,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down Expand Up @@ -1310,7 +1308,6 @@ private IAccount JoinArena(
PreviousState = states,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return states;
Expand Down
3 changes: 0 additions & 3 deletions .Lib9c.Tests/Action/BattleArena9Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -973,7 +973,6 @@ public void ExecuteDuplicatedException(int slotIndex, int runeId, int slotIndex2
PreviousState = previousStates,
Signer = _agent1Address,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
}));
}
Expand Down Expand Up @@ -1205,7 +1204,6 @@ private void Execute(
PreviousState = previousStates,
Signer = myAgentAddress,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});

Expand Down Expand Up @@ -1310,7 +1308,6 @@ private IAccount JoinArena(
PreviousState = states,
Signer = signer,
RandomSeed = random.Seed,
Rehearsal = false,
BlockIndex = blockIndex,
});
return states;
Expand Down
3 changes: 0 additions & 3 deletions .Lib9c.Tests/Action/Buy10Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,6 @@ public void Execute(params OrderData[] orderDataList)
BlockIndex = 100,
PreviousState = _initialState,
RandomSeed = 0,
Rehearsal = false,
Signer = _buyerAgentAddress,
});

Expand Down Expand Up @@ -701,7 +700,6 @@ public void Execute_ReconfigureFungibleItem(params OrderData[] orderDataList)
BlockIndex = 100,
PreviousState = _initialState,
RandomSeed = 0,
Rehearsal = false,
Signer = _buyerAgentAddress,
});

Expand Down Expand Up @@ -809,7 +807,6 @@ public void Execute_With_Testbed()
BlockIndex = 100,
PreviousState = nextState,
RandomSeed = 0,
Rehearsal = false,
Signer = result.GetAgentState().address,
});

Expand Down
4 changes: 0 additions & 4 deletions .Lib9c.Tests/Action/Buy11Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,6 @@ public void Execute(params OrderData[] orderDataList)
BlockIndex = 100,
PreviousState = _initialState,
RandomSeed = 0,
Rehearsal = false,
Signer = _buyerAgentAddress,
});

Expand Down Expand Up @@ -707,7 +706,6 @@ public void Execute_ReconfigureFungibleItem(params OrderData[] orderDataList)
BlockIndex = 100,
PreviousState = _initialState,
RandomSeed = 0,
Rehearsal = false,
Signer = _buyerAgentAddress,
});

Expand Down Expand Up @@ -818,7 +816,6 @@ public void Execute_With_Testbed()
BlockIndex = 100,
PreviousState = nextState,
RandomSeed = 0,
Rehearsal = false,
Signer = result.GetAgentState().address,
});

Expand Down Expand Up @@ -937,7 +934,6 @@ public void Execute_ActionObsoletedException()
BlockIndex = 100,
PreviousState = nextState,
RandomSeed = 0,
Rehearsal = false,
Signer = result.GetAgentState().address,
});
});
Expand Down
1 change: 0 additions & 1 deletion .Lib9c.Tests/Action/Buy2Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ public void Execute()
BlockIndex = 0,
PreviousState = _initialState,
RandomSeed = 0,
Rehearsal = false,
Signer = _buyerAgentAddress,
});

Expand Down
1 change: 0 additions & 1 deletion .Lib9c.Tests/Action/Buy3Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ public void Execute()
BlockIndex = 0,
PreviousState = previousStates,
RandomSeed = 0,
Rehearsal = false,
Signer = _buyerAgentAddress,
});

Expand Down
1 change: 0 additions & 1 deletion .Lib9c.Tests/Action/Buy4Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ public void Execute()
BlockIndex = 0,
PreviousState = previousStates,
RandomSeed = 0,
Rehearsal = false,
Signer = _buyerAgentAddress,
});

Expand Down
1 change: 0 additions & 1 deletion .Lib9c.Tests/Action/Buy5Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,6 @@ public void Execute(params ShopItemData[] shopItemMembers)
BlockIndex = 1,
PreviousState = _initialState,
RandomSeed = 0,
Rehearsal = false,
Signer = _buyerAgentAddress,
});

Expand Down
1 change: 0 additions & 1 deletion .Lib9c.Tests/Action/Buy6Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ out _
BlockIndex = 1,
PreviousState = _initialState,
RandomSeed = 0,
Rehearsal = false,
Signer = _buyerAgentAddress,
});

Expand Down
1 change: 0 additions & 1 deletion .Lib9c.Tests/Action/Buy7Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,6 @@ out _
BlockIndex = 1,
PreviousState = _initialState,
RandomSeed = 0,
Rehearsal = false,
Signer = _buyerAgentAddress,
});

Expand Down
Loading

0 comments on commit dbd6e96

Please sign in to comment.