Fixed more tests

cmd/util/cmd/execution-state-extract/export_report.json

@@ -1,6 +1,6 @@
 {
  "EpochCounter": 0,
- "PreviousStateCommitment": "829fd1ec06c9a40e5ceba9cff537e30806332aba6065da21a11556136d171c98",
- "CurrentStateCommitment": "829fd1ec06c9a40e5ceba9cff537e30806332aba6065da21a11556136d171c98",
+ "PreviousStateCommitment": "170cbb4dd9c2b90362d09e5c05641de30e1ac6aa938ed4ea866fa592fba16566",
+ "CurrentStateCommitment": "170cbb4dd9c2b90362d09e5c05641de30e1ac6aa938ed4ea866fa592fba16566",
  "ReportSucceeded": true
 }

model/flow/identity.go

@@ -130,7 +130,9 @@ type encodableIdentity struct {
 	NodeID        Identifier
 	Address       string `json:",omitempty"`
 	Role          Role
+	InitialWeight uint64
 	Weight        uint64
+	Ejected       bool
 	StakingPubKey []byte
 	NetworkPubKey []byte
 }
@@ -145,7 +147,14 @@ type decodableIdentity struct {
 }
 
 func encodableFromIdentity(iy Identity) (encodableIdentity, error) {
-	ie := encodableIdentity{iy.NodeID, iy.Address, iy.Role, iy.Weight, nil, nil}
+	ie := encodableIdentity{
+		NodeID:        iy.NodeID,
+		Address:       iy.Address,
+		Role:          iy.Role,
+		InitialWeight: iy.InitialWeight,
+		Weight:        iy.Weight,
+		Ejected:       iy.Ejected,
+	}
 	if iy.StakingPubKey != nil {
 		ie.StakingPubKey = iy.StakingPubKey.Encode()
 	}
@@ -208,7 +217,9 @@ func identityFromEncodable(ie encodableIdentity, identity *Identity) error {
 	identity.NodeID = ie.NodeID
 	identity.Address = ie.Address
 	identity.Role = ie.Role
+	identity.InitialWeight = ie.InitialWeight
 	identity.Weight = ie.Weight
+	identity.Ejected = ie.Ejected
 	var err error
 	if ie.StakingPubKey != nil {
 		if identity.StakingPubKey, err = crypto.DecodePublicKey(crypto.BLSBLS12381, ie.StakingPubKey); err != nil {

model/flow/identity_test.go

@@ -81,7 +81,8 @@ func TestIdentityEncodingJSON(t *testing.T) {
 		enc, err := json.Marshal(identity)
 		require.NoError(t, err)
 		// emulate the old encoding by replacing the new field with old field name
-		enc = []byte(strings.Replace(string(enc), "Weight", "Stake", 1))
+		// NOTE: use replace in such way to avoid replacing InitialWeight field.
+		enc = []byte(strings.Replace(string(enc), "\"Weight", "\"Stake", 1))
 		var dec flow.Identity
 		err = json.Unmarshal(enc, &dec)
 		require.NoError(t, err)