feat(gnomod): forbid require and find dependencies without it #3123

n0izn0iz · 2024-11-14T07:36:12Z

A step towards the importer package (#2932) and future of gno.mod (#2904)

BREAKING CHANGE: remove require statement support from gno.mod
use .gno files import statements to find dependencies
extract package download routines in gnovm/pkg/gnopkgfetch
add and use a mocked rpc client that "fetch" packages from the examples dir
extract imports gathering utils in gnovm/pkg/gnoimports

I decided to do this first to avoid having multiple ways to resolve dependencies lying around in the codebase and causing confusion in subsequent steps

Contributors' checklist...

Added new tests, or not needed, or not feasible
Provided an example (e.g. screenshot) to aid review or the PR is self-explanatory
Updated the official documentation or not needed
No breaking changes were made, or a BREAKING CHANGE: xxx message was included in the description
Added references to related issues and PRs
Provided any useful hints for running manual tests

Signed-off-by: Norman Meier <norman@samourai.coop>

…ould be reverted) Signed-off-by: Norman Meier <norman@samourai.coop>

Signed-off-by: Norman Meier <norman@samourai.coop>

…e-require

Signed-off-by: Norman Meier <norman@samourai.coop>

…e-require

n0izn0iz · 2024-11-14T08:31:19Z

gnovm/pkg/gnopkgfetch/gnopkgfetch_testing.go

+
+	res := ctypes.ResultABCIQuery{}
+
+	finfo, err := os.Stat(target)


gnovm/pkg/gnopkgfetch/gnopkgfetch_testing.go

+	}
+
+	if finfo.IsDir() {
+		entries, err := os.ReadDir(target)


gnovm/pkg/gnopkgfetch/gnopkgfetch_testing.go

+		}
+		res.Response.Data = []byte(strings.Join(files, "\n"))
+	} else {
+		content, err := os.ReadFile(target)


gnovm/pkg/gnopkgfetch/gnopkgfetch_testing.go

+
+	res := ctypes.ResultABCIQuery{}
+
+	finfo, err := os.Stat(target)


gnovm/pkg/gnopkgfetch/gnopkgfetch_testing.go

+	}
+
+	if finfo.IsDir() {
+		entries, err := os.ReadDir(target)


gnovm/pkg/gnopkgfetch/gnopkgfetch_testing.go

+		}
+		res.Response.Data = []byte(strings.Join(files, "\n"))
+	} else {
+		content, err := os.ReadFile(target)


Signed-off-by: Norman Meier <norman@samourai.coop>

moul · 2024-11-14T08:13:06Z

gnovm/pkg/gnolang/helpers.go

@@ -35,6 +36,11 @@ func IsStdlib(s string) bool {
 	return !strings.HasPrefix(s, "gno.land/")


For your information, this will become dynamic in #2911, which will be finished soon.

I recommend waiting for #2911 to be completed and merged before making any further hardcoded changes to the domain.

Edit: I believe it's fine; the potential conflict should be easy to resolve from any direction. There's no need to wait for #2911.

n0izn0iz · 2024-11-14T10:13:58Z

~~@thehowl actually this is fully ready for review, the tests are failing due to codecov only it seems~~

Signed-off-by: Norman Meier <norman@samourai.coop>

codecov · 2024-11-14T18:34:39Z

Codecov Report

Attention: Patch coverage is 62.06897% with 99 lines in your changes missing coverage. Please review.

Project coverage is 63.68%. Comparing base (b3800b7) to head (89185f8).

Files with missing lines	Patch %	Lines
gnovm/pkg/gnopkgfetch/gnopkgfetch.go	51.21%	31 Missing and 9 partials ⚠️
gnovm/pkg/gnopkgfetch/gnopkgfetch_testing.go	65.62%	16 Missing and 6 partials ⚠️
gnovm/pkg/gnoimports/imports.go	65.90%	10 Missing and 5 partials ⚠️
gnovm/pkg/gnomod/file.go	14.28%	6 Missing ⚠️
gnovm/pkg/doc/dirs.go	81.48%	4 Missing and 1 partial ⚠️
gnovm/pkg/gnomod/pkg.go	73.68%	3 Missing and 2 partials ⚠️
gno.land/pkg/integration/testing_integration.go	70.00%	2 Missing and 1 partial ⚠️
gnovm/pkg/gnolang/helpers.go	0.00%	2 Missing ⚠️
gnovm/pkg/gnomod/gnomod.go	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #3123      +/-   ##
==========================================
- Coverage   63.80%   63.68%   -0.13%     
==========================================
  Files         549      552       +3     
  Lines       78833    78748      -85     
==========================================
- Hits        50301    50152     -149     
- Misses      25143    25202      +59     
- Partials     3389     3394       +5

Flag	Coverage Δ
contribs/gnodev	`61.16% <ø> (ø)`
contribs/gnofaucet	`14.82% <ø> (ø)`
gno.land	`73.67% <70.00%> (-0.03%)`	⬇️
gnovm	`67.68% <61.75%> (-0.26%)`	⬇️
misc/genstd	`79.72% <ø> (ø)`
tm2	`62.35% <ø> (-0.04%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚨 Try these New Features:

Flaky Tests Detection - Detect and resolve failed and flaky tests
JS Bundle Analysis - Avoid shipping oversized bundles

n0izn0iz · 2024-11-14T18:47:28Z

seems some tests are failing after merging master, my bad, will fix asap

Signed-off-by: Norman Meier <norman@samourai.coop>

n0izn0iz · 2024-11-15T07:11:00Z

fixed

Signed-off-by: Norman Meier <norman@samourai.coop>

…e-require

n0izn0iz added 30 commits November 7, 2024 01:05

chore: explicitely remove require support

6c702b9

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: finish remove require (+ tmp move utils to load package but sh…

946f9e3

…ould be reverted) Signed-off-by: Norman Meier <norman@samourai.coop>

feat: mod download without require

773c548

Signed-off-by: Norman Meier <norman@samourai.coop>

feat: module download without require

ccf8bb8

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: refactor

14be54f

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: remove unused writePackage func

78ecedb

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: use PackageDir helper

70cfde5

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: merge remote-tracking branch 'origin/master' into gnomod-remov…

4e01fd3

…e-require

fix: doc imports without require

13a1e21

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: fix tests

77d696d

Signed-off-by: Norman Meier <norman@samourai.coop>

fix: txtar loader

43afcc9

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: forbid require

89ca164

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: tidy

409bb3c

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: fmt

a411efa

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: remove debug artifact

4bc9998

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: cleaner examples client'

3e2450e

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: go mod tidy

2ced616

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: refacto

3924102

Signed-off-by: Norman Meier <norman@samourai.coop>

fix: return errors

eff07fb

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: move / rename

9bf675a

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: move back utils

bee03a0

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: rename funcs and write doc

c749846

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: refacto

8f32074

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: atomicize

c353b21

Signed-off-by: Norman Meier <norman@samourai.coop>

fix: bad refactor

283b308

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: remove unused funcs

d4f6cad

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: dedup code

e1331fd

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: port test

965095b

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: add fetch test with replace

07cccc6

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: more test cases

e65600f

Signed-off-by: Norman Meier <norman@samourai.coop>

n0izn0iz added 2 commits November 14, 2024 08:25

chore: unexpose testing client

7b385d5

Signed-off-by: Norman Meier <norman@samourai.coop>

chore: merge remote-tracking branch 'origin/master' into gnomod-remov…

9ebbf69

…e-require

github-actions bot added 🧾 package/realm Tag used for new Realms or Packages. 📦 🤖 gnovm Issues or PRs gnovm related 📦 ⛰️ gno.land Issues or PRs gno.land package related labels Nov 14, 2024

github-actions bot assigned n0izn0iz Nov 14, 2024

github-advanced-security bot found potential problems Nov 14, 2024

View reviewed changes

fix: remove stdlibs from test imports

736d7f6

Signed-off-by: Norman Meier <norman@samourai.coop>

n0izn0iz changed the title ~~feat(gnomod): forbid require and find imports without it~~ feat(gnomod): forbid require and find dependencies without it Nov 14, 2024

moul reviewed Nov 14, 2024

View reviewed changes

Merge branch 'master' into gnomod-remove-require

519c51b

n0izn0iz marked this pull request as ready for review November 14, 2024 10:13

Kouteki requested a review from thehowl November 14, 2024 13:34

chore: bump for CI

d10eb8a

Signed-off-by: Norman Meier <norman@samourai.coop>

n0izn0iz marked this pull request as draft November 14, 2024 18:47

n0izn0iz and others added 2 commits November 15, 2024 05:33

Merge branch 'master' into gnomod-remove-require

b7ca880

fix: remove self from pkg imports

144c0cc

Signed-off-by: Norman Meier <norman@samourai.coop>

n0izn0iz marked this pull request as ready for review November 15, 2024 07:10

Kouteki added the in focus Core team is prioritizing this work label Nov 15, 2024

n0izn0iz and others added 5 commits November 16, 2024 18:33

Merge branch 'master' into gnomod-remove-require

03cee2b

fix: remove require

485d63e

Signed-off-by: Norman Meier <norman@samourai.coop>

Merge branch 'master' into gnomod-remove-require

4847000

Merge branch 'master' into gnomod-remove-require

9c2ec60

chore: Merge remote-tracking branch 'origin/master' into gnomod-remov…

89185f8

…e-require

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(gnomod): forbid require and find dependencies without it #3123

feat(gnomod): forbid require and find dependencies without it #3123

n0izn0iz commented Nov 14, 2024 •

edited

Loading

n0izn0iz Nov 14, 2024

moul Nov 14, 2024 •

edited

Loading

n0izn0iz commented Nov 14, 2024 •

edited

Loading

codecov bot commented Nov 14, 2024 •

edited

Loading

n0izn0iz commented Nov 14, 2024

n0izn0iz commented Nov 15, 2024


		res := ctypes.ResultABCIQuery{}

		finfo, err := os.Stat(target)

		@@ -35,6 +36,11 @@ func IsStdlib(s string) bool {
		return !strings.HasPrefix(s, "gno.land/")

feat(gnomod): forbid require and find dependencies without it #3123

Are you sure you want to change the base?

feat(gnomod): forbid require and find dependencies without it #3123

Conversation

n0izn0iz commented Nov 14, 2024 • edited Loading

n0izn0iz Nov 14, 2024

Choose a reason for hiding this comment

moul Nov 14, 2024 • edited Loading

Choose a reason for hiding this comment

n0izn0iz commented Nov 14, 2024 • edited Loading

codecov bot commented Nov 14, 2024 • edited Loading

Codecov Report

n0izn0iz commented Nov 14, 2024

n0izn0iz commented Nov 15, 2024

n0izn0iz commented Nov 14, 2024 •

edited

Loading

moul Nov 14, 2024 •

edited

Loading

n0izn0iz commented Nov 14, 2024 •

edited

Loading

codecov bot commented Nov 14, 2024 •

edited

Loading