File tree Expand file tree Collapse file tree 1 file changed +4
-4
lines changed
Expand file tree Collapse file tree 1 file changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -250,7 +250,7 @@ func (j *scopedJournal) merge(parent *scopedJournal) {
250250 if parent .refund == - 1 {
251251 parent .refund = j .refund
252252 }
253- // Revert changes to accounts
253+ // Merge changes to accounts
254254 if parent .accountChanges == nil {
255255 parent .accountChanges = j .accountChanges
256256 } else {
@@ -262,10 +262,10 @@ func (j *scopedJournal) merge(parent *scopedJournal) {
262262 parent .accountChanges [addr ] = data
263263 }
264264 }
265- // Revert logs
265+ // Merge logs
266266 parent .logs = append (parent .logs , j .logs ... )
267267
268- // Revert access list additions
268+ // Merge access list additions
269269 parent .accessListAddrSlots = append (parent .accessListAddrSlots , j .accessListAddrSlots ... )
270270 parent .accessListAddresses = append (parent .accessListAddresses , j .accessListAddresses ... )
271271
@@ -289,7 +289,7 @@ func (j *scopedJournal) merge(parent *scopedJournal) {
289289 if parent .tStorageChanges == nil {
290290 parent .tStorageChanges = j .tStorageChanges
291291 } else {
292- // Revert t-store changes
292+ // Merge t-store changes
293293 for addr , changes := range j .tStorageChanges {
294294 prevChanges , ok := parent .tStorageChanges [addr ]
295295 if ! ok {
You can’t perform that action at this time.
0 commit comments