Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(gnovm): show object updates using difflib, log blocks #3894

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix(gnovm): show object updates using difflib, log blocks #3894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
be1afb6
fix(gnovm): revert block removal in opslog
omarsy Mar 7, 2025
410cec5
Merge branch 'master' into revert-no-block-ops-log
omarsy Mar 7, 2025
a8d13e5
use diffs instead
thehowl Mar 7, 2025
1da38b1
remove old-new
thehowl Mar 7, 2025
241c5ad
update examples
thehowl Mar 7, 2025
b42418c
fixup tests
thehowl Mar 10, 2025
56610d9
Merge branch 'master' of github.com:gnolang/gno into dev/morgan/realm…
thehowl Mar 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 33 additions & 19 deletions examples/gno.land/p/demo/avl/z_0_filetest.gno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,18 @@ func main() {

// Realm:
// switchrealm["gno.land/r/test"]
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:4]={
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:4",
// "ModTime": "7",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:7",
// "RefCount": "1"
// },
// "Value": {
// "T": {
// "@type": "/gno.RefType",
// "ID": "gno.land/p/demo/avl.Node"
// },
// "V": {
// "@type": "/gno.RefValue",
// "Hash": "627e8e517e7ae5db0f3b753e2a32b607989198b6",
// "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:5"
// }
// }
// }
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:4]=
// @@ -1,8 +1,8 @@
// {
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:4",
// - "ModTime": "0",
// - "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:2",
// + "ModTime": "7",
// + "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:7",
// "RefCount": "1"
// },
// "Value": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line and the next ones look weird, nope?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to provide some context so that there is some idea of what is actually being modified; imo it is intelligible given the indentation of the diff. Do you think it should be done differently?

// c[a8ada09dee16d791fd406d629fe29bb0ed084a30:9]={
// "Fields": [
// {
Expand Down Expand Up @@ -215,3 +208,24 @@ func main() {
// }
// }
// }
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:2]=
// @@ -3,7 +3,7 @@
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:2",
// "IsEscaped": true,
// - "ModTime": "3",
// + "ModTime": "5",
// "RefCount": "2"
// },
// "Parent": null,
// @@ -30,8 +30,8 @@
// "@type": "/gno.PointerValue",
// "Base": {
// "@type": "/gno.RefValue",
// - "Hash": "424b49c215f471979ccd718172a016e6ec9dd934",
// - "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:4"
// + "Hash": "ae86874f9b47fa5e64c30b3e92e9d07f2ec967a4",
// + "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:6"
// },
// "Index": "0",
// "TV": null
79 changes: 41 additions & 38 deletions examples/gno.land/p/demo/avl/z_1_filetest.gno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,44 +24,26 @@ func main() {

// Realm:
// switchrealm["gno.land/r/test"]
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:6]={
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:6",
// "ModTime": "11",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:5",
// "RefCount": "1"
// },
// "Value": {
// "T": {
// "@type": "/gno.RefType",
// "ID": "gno.land/p/demo/avl.Node"
// },
// "V": {
// "@type": "/gno.RefValue",
// "Hash": "1375f6f96a1a3f298347dc8fc0065afa36cb7f0f",
// "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:7"
// }
// }
// }
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:8]={
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:8",
// "ModTime": "13",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:5",
// "RefCount": "1"
// },
// "Value": {
// "T": {
// "@type": "/gno.RefType",
// "ID": "gno.land/p/demo/avl.Node"
// },
// "V": {
// "@type": "/gno.RefValue",
// "Hash": "b28057ab7be6383785c0a5503e8a531bdbc21851",
// "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:9"
// }
// }
// }
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:6]=
// @@ -1,7 +1,7 @@
// {
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:6",
// - "ModTime": "0",
// + "ModTime": "11",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:5",
// "RefCount": "1"
// },
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:8]=
// @@ -1,7 +1,7 @@
// {
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:8",
// - "ModTime": "0",
// + "ModTime": "13",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:5",
// "RefCount": "1"
// },
// c[a8ada09dee16d791fd406d629fe29bb0ed084a30:15]={
// "Fields": [
// {
Expand Down Expand Up @@ -326,5 +308,26 @@ func main() {
// }
// }
// }
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:2]=
// @@ -3,7 +3,7 @@
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:2",
// "IsEscaped": true,
// - "ModTime": "3",
// + "ModTime": "9",
// "RefCount": "2"
// },
// "Parent": null,
// @@ -30,8 +30,8 @@
// "@type": "/gno.PointerValue",
// "Base": {
// "@type": "/gno.RefValue",
// - "Hash": "213a2c56908ed00c6d21377f37be61a76102cd5f",
// - "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:4"
// + "Hash": "515b45e4a6f5fa153a0251d7108781d86c52ce1c",
// + "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:10"
// },
// "Index": "0",
// "TV": null
// d[a8ada09dee16d791fd406d629fe29bb0ed084a30:4]
// d[a8ada09dee16d791fd406d629fe29bb0ed084a30:5]
108 changes: 41 additions & 67 deletions examples/gno.land/p/demo/avl/z_2_filetest.gno
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,44 +23,26 @@ func main() {

// Realm:
// switchrealm["gno.land/r/test"]
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:7]={
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:7",
// "ModTime": "12",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:6",
// "RefCount": "1"
// },
// "Value": {
// "T": {
// "@type": "/gno.RefType",
// "ID": "gno.land/p/demo/avl.Node"
// },
// "V": {
// "@type": "/gno.RefValue",
// "Hash": "ba7550123807b8da857e38b72f66204b1ec582a2",
// "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:8"
// }
// }
// }
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:9]={
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:9",
// "ModTime": "14",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:6",
// "RefCount": "1"
// },
// "Value": {
// "T": {
// "@type": "/gno.RefType",
// "ID": "gno.land/p/demo/avl.Node"
// },
// "V": {
// "@type": "/gno.RefValue",
// "Hash": "3cb8485664c356fcb5c88dfb96b7455133a6b022",
// "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:10"
// }
// }
// }
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:7]=
// @@ -1,7 +1,7 @@
// {
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:7",
// - "ModTime": "0",
// + "ModTime": "12",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:6",
// "RefCount": "1"
// },
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:9]=
// @@ -1,7 +1,7 @@
// {
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:9",
// - "ModTime": "0",
// + "ModTime": "14",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:6",
// "RefCount": "1"
// },
// c[a8ada09dee16d791fd406d629fe29bb0ed084a30:16]={
// "Fields": [
// {
Expand Down Expand Up @@ -325,34 +307,26 @@ func main() {
// }
// }
// }
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:3]={
// "Fields": [
// {
// "T": {
// "@type": "/gno.PointerType",
// "Elt": {
// "@type": "/gno.RefType",
// "ID": "gno.land/p/demo/avl.Node"
// }
// },
// "V": {
// "@type": "/gno.PointerValue",
// "Base": {
// "@type": "/gno.RefValue",
// "Hash": "ff46b4dd63457c3fd59801e725f65af524ec829d",
// "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:11"
// },
// "Index": "0",
// "TV": null
// }
// }
// ],
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:3",
// "ModTime": "10",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:2",
// "RefCount": "1"
// }
// }
// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:3]=
// @@ -12,8 +12,8 @@
// "@type": "/gno.PointerValue",
// "Base": {
// "@type": "/gno.RefValue",
// - "Hash": "fbf007d972314fd7a2005d628c444b0831c16402",
// - "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:5"
// + "Hash": "ff46b4dd63457c3fd59801e725f65af524ec829d",
// + "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:11"
// },
// "Index": "0",
// "TV": null
// @@ -22,7 +22,7 @@
// ],
// "ObjectInfo": {
// "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:3",
// - "ModTime": "4",
// + "ModTime": "10",
// "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:2",
// "RefCount": "1"
// }
// d[a8ada09dee16d791fd406d629fe29bb0ed084a30:5]
// d[a8ada09dee16d791fd406d629fe29bb0ed084a30:6]
Loading
Loading