Skip to content

Commit a2e6af1

Browse files
author
vividcoder
committed
fix: fix remaining a0-prefix addresses missed in previous migration
- VMContractTestBase: WITNESS_SR1_ADDRESS "a0" -> "41" - IsSRCandidateTest: nonexistentAddr hex "A0" -> "41" - config-test-storagetest.conf: convert 16 genesis 27-prefix addresses to T-prefix - config-test-index.conf: convert genesis 27-prefix address to T-prefix - .gitignore: broaden bin/ pattern to **/bin/, add *.class
1 parent 51594c7 commit a2e6af1

4 files changed

Lines changed: 19 additions & 19 deletions

File tree

framework/src/test/java/org/tron/common/runtime/vm/IsSRCandidateTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public void testIsSRCandidate()
152152
// Trigger contract method: isSRCandidateTest(address)
153153
String methodByAddr = "isSRCandidateTest(address)";
154154
String nonexistentAccount = "TWyoFfJBiKGkVQd28HTqxsc8kbMtQUmqgi";
155-
byte[] nonexistentAddr = Hex.decode("A0E6773BBF60F97D22AA3BF73D2FE235E816A1964F");
155+
byte[] nonexistentAddr = Hex.decode("41E6773BBF60F97D22AA3BF73D2FE235E816A1964F");
156156
String hexInput =
157157
AbiUtil.parseMethod(methodByAddr, Collections.singletonList(nonexistentAccount));
158158

framework/src/test/java/org/tron/common/runtime/vm/VMContractTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class VMContractTestBase {
4747

4848
static {
4949
// TDmHUBuko2qhcKBCGGafu928hMRj1tX2RW (test.config)
50-
WITNESS_SR1_ADDRESS = "a0" + "299F3DB80A24B20A254B89CE639D59132F157F13";
50+
WITNESS_SR1_ADDRESS = "41" + "299F3DB80A24B20A254B89CE639D59132F157F13";
5151
}
5252

5353
@Before

framework/src/test/resources/config-test-index.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ genesis.block = {
153153
{
154154
accountName = "Blackhole"
155155
accountType = "AssetIssue"
156-
address = "27WtBq2KoSy5v8VnVZBZHHJcDuWNiSgjbE3"
156+
address = "THmtHi1Rzq4gSKYGEKv1DPkV7au6xU1AUB"
157157
balance = "-9223372036854775808"
158158
}
159159
]

framework/src/test/resources/config-test-storagetest.conf

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -165,88 +165,88 @@ genesis.block = {
165165
# {
166166
# accountName = "tron"
167167
# accountType = "AssetIssue" # Normal/AssetIssue/Contract
168-
# address = "27V2x39zmmJeVGBGSheAk1281z8svbWgn6C"
168+
# address = "TFveVqgQKAdFa12DNnXTw7GHCDQK7fUVen"
169169
# balance = "10"
170170
# }
171171
{
172172
accountName = "Devaccount"
173173
accountType = "AssetIssue"
174-
address = "27d3byPxZXKQWfXX7sJvemJJuv5M65F3vjS"
174+
address = "TPwJS5eC5BPGyMGtYTHNhPTB89sUWjDSSu"
175175
balance = "10000000000000000"
176176
},
177177
{
178178
accountName = "Zion"
179179
accountType = "AssetIssue"
180-
address = "27fXgQ46DcjEsZ444tjZPKULcxiUfDrDjqj"
180+
address = "TSRNrjmrAbDdrsoqZsv7FZUtAo13fwoCzv"
181181
balance = "15000000000000000"
182182
},
183183
{
184184
accountName = "Sun"
185185
accountType = "AssetIssue"
186-
address = "27SWXcHuQgFf9uv49FknBBBYBaH3DUk4JPx"
186+
address = "TDQE4yb3E7dvDjouvu8u7GgSnMZbxAEumV"
187187
balance = "10000000000000000"
188188
},
189189
{
190190
accountName = "Blackhole"
191191
accountType = "AssetIssue"
192-
address = "27WtBq2KoSy5v8VnVZBZHHJcDuWNiSgjbE3"
192+
address = "THmtHi1Rzq4gSKYGEKv1DPkV7au6xU1AUB"
193193
balance = "-9223372036854775808"
194194
}
195195
]
196196

197197
witnesses = [
198198
{
199-
address: 27Ssb1WE8FArwJVRRb8Dwy3ssVGuLY8L3S1
199+
address: TDmHUBuko2qhcKBCGGafu928hMRj1tX2RW
200200
url = "http://Mercury.org",
201201
voteCount = 105
202202
},
203203
{
204-
address: 27anh4TDZJGYpsn4BjXzb7uEArNALxwiZZW
204+
address: TMgPX8uBr8XbBboxQgMK3zNS4SgjUa3eiP
205205
url = "http://Venus.org",
206206
voteCount = 104
207207
},
208208
{
209-
address: 27Wkfa5iEJtsKAKdDzSmF1b2gDm5s49kvdZ
209+
address: THeN2mPrrkr5U9Nzfb7xwgAwRqcFWcL7pR
210210
url = "http://Earth.org",
211211
voteCount = 103
212212
},
213213
{
214-
address: 27bqKYX9Bgv7dgTY7xBw5SUHZ8EGaPSikjx
214+
address: TNj21CppEn6PzHHtdLHoNZRpLJnxogNnAX
215215
url = "http://Mars.org",
216216
voteCount = 102
217217
},
218218
{
219-
address: 27fASUY6qKtsaAEPz6QxhZac2KYVz2ZRTXW
219+
address: TS48wDnTskrLU49kmZKRVfkHXd2NQ3dZP4
220220
url = "http://Jupiter.org",
221221
voteCount = 101
222222
},
223223
{
224-
address: 27Q3RSbiqm59VXcF8shQWHKbyztfso5FwvP
224+
address: TAw7uHQUJw8FqRzuYqmEDQkFCyCGE4JcsW
225225
url = "http://Saturn.org",
226226
voteCount = 100
227227
},
228228
{
229-
address: 27YkUVSuvCK3K84DbnFnxYUxozpi793PTqZ
229+
address: TKeAx8bYkB25RsyNTQ9gUa75CuEVfFbF6N
230230
url = "http://Uranus.org",
231231
voteCount = 99
232232
},
233233
{
234-
address: 27kdTBTDJ16hK3Xqr8PpCuQJmje1b94CDJU
234+
address: TXX9e8tvYxg5MMbcoYAvqVT2wiXyacjs65
235235
url = "http://Neptune.org",
236236
voteCount = 98
237237
},
238238
{
239-
address: 27mw9UpRy7inTMQ5kUzsdTc2QZ6KvtCX4uB
239+
address: TYpqwW7bfamDfDqXA9EMPhAfmArKMicxp9
240240
url = "http://Pluto.org",
241241
voteCount = 97
242242
},
243243
{
244-
address: 27QzC4PeQZJ2kFMUXiCo4S8dx3VWN5U9xcg
244+
address: TBstX5L37A1WZBEJPM9nNDnDFa2kcTVSmc
245245
url = "http://Altair.org",
246246
voteCount = 96
247247
},
248248
{
249-
address: 27VZHn9PFZwNh7o2EporxmLkpe157iWZVkh
249+
address: TGSzEq4t7oMTRcn1VxDghRu5r5bWAE5D1W
250250
url = "http://AlphaLyrae.org",
251251
voteCount = 95
252252
}

0 commit comments

Comments
 (0)