diff options
author | Tsachi Herman <tsachi.herman@algorand.com> | 2022-02-24 11:25:25 -0500 |
---|---|---|
committer | Tsachi Herman <tsachi.herman@algorand.com> | 2022-02-24 11:25:25 -0500 |
commit | 944448278430ee15aa39524454f99348645cdc31 (patch) | |
tree | b67551b4a15b4e3564deef3caa300cf336adabad | |
parent | 81b4cbfe8ef6f7a8bc9802a4b5bdfd4db82f5b81 (diff) |
forward-port the changes from the consensus upgrade PR.
-rw-r--r-- | ledger/applications_test.go | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/ledger/applications_test.go b/ledger/applications_test.go index defbbe019..1f643fb0f 100644 --- a/ledger/applications_test.go +++ b/ledger/applications_test.go @@ -134,18 +134,36 @@ return` a.Contains(genesisInitState.Accounts, userLocal) a.Contains(genesisInitState.Accounts, userLocal2) - expectedCreatorBase, err := hex.DecodeString("84a16101a162ce009d2290a16704a16b01") - a.NoError(err) - expectedCreatorResource, err := hex.DecodeString("85a171c45602200200012604056c6f63616c06676c6f62616c026c6b02676b3118221240003331192212400010311923124000022243311b221240001c361a00281240000a361a0029124000092243222a28664200032b29672343a172c40102a17501a17704a17903") - a.NoError(err) - expectedUserOptInBase, err := hex.DecodeString("84a16101a162ce00a02fd0a16701a16c01") - a.NoError(err) - expectedUserOptInResource, err := hex.DecodeString("81a16f01") - a.NoError(err) - expectedUserLocalBase, err := hex.DecodeString("84a16101a162ce00a33540a16701a16c01") - a.NoError(err) - expectedUserLocalResource, err := hex.DecodeString("82a16f01a17081a26c6b82a27462a56c6f63616ca2747401") - a.NoError(err) + var expectedCreatorBase, expectedCreatorResource, expectedUserOptInBase, expectedUserOptInResource, expectedUserLocalBase, expectedUserLocalResource []byte + // the difference between these encoded structure is the UpdateRound variable. This variable is not being set before + // the consensus upgrade, and affects only nodes that have been updated. + if proto.EnableAccountDataResourceSeparation { + expectedCreatorBase, err = hex.DecodeString("85a16101a162ce009d2290a16704a16b01a17a01") + a.NoError(err) + expectedCreatorResource, err = hex.DecodeString("86a171c45602200200012604056c6f63616c06676c6f62616c026c6b02676b3118221240003331192212400010311923124000022243311b221240001c361a00281240000a361a0029124000092243222a28664200032b29672343a172c40102a17501a17704a17903a17a01") + a.NoError(err) + expectedUserOptInBase, err = hex.DecodeString("85a16101a162ce00a02fd0a16701a16c01a17a02") + a.NoError(err) + expectedUserOptInResource, err = hex.DecodeString("82a16f01a17a02") + a.NoError(err) + expectedUserLocalBase, err = hex.DecodeString("85a16101a162ce00a33540a16701a16c01a17a04") + a.NoError(err) + expectedUserLocalResource, err = hex.DecodeString("83a16f01a17081a26c6b82a27462a56c6f63616ca2747401a17a04") + a.NoError(err) + } else { + expectedCreatorBase, err = hex.DecodeString("84a16101a162ce009d2290a16704a16b01") + a.NoError(err) + expectedCreatorResource, err = hex.DecodeString("85a171c45602200200012604056c6f63616c06676c6f62616c026c6b02676b3118221240003331192212400010311923124000022243311b221240001c361a00281240000a361a0029124000092243222a28664200032b29672343a172c40102a17501a17704a17903") + a.NoError(err) + expectedUserOptInBase, err = hex.DecodeString("84a16101a162ce00a02fd0a16701a16c01") + a.NoError(err) + expectedUserOptInResource, err = hex.DecodeString("81a16f01") + a.NoError(err) + expectedUserLocalBase, err = hex.DecodeString("84a16101a162ce00a33540a16701a16c01") + a.NoError(err) + expectedUserLocalResource, err = hex.DecodeString("82a16f01a17081a26c6b82a27462a56c6f63616ca2747401") + a.NoError(err) + } cfg := config.GetDefaultLocal() l, err := OpenLedger(logging.Base(), "TestAppAccountData", true, genesisInitState, cfg) |