Move osmomath into its own go.mod #3771

ValarDragon · 2022-12-16T20:55:23Z

Closes: #3744 (after we get a tag for this folder, that comes after this is merged)

What is the purpose of the change

Move osmomath into its own go.mod, but all our code set to use latest code in the folder.

Brief Changelog

Move osmomath into its own go.mod. To update, change your osmomath import to github.com/osmosis-labs/osmosis/v13/osmomath to github.com/osmosis-labs/osmosis/osmomath

Testing and Verifying

All tests still pass

Documentation and Release Note

Does this pull request introduce a new feature or user-facing behavior changes? yes
Is a relevant changelog entry added to the Unreleased section in CHANGELOG.md? yes
How is the feature or change documented? N/A

ValarDragon · 2022-12-16T21:10:36Z

Dockerfile

@@ -19,7 +19,7 @@ RUN apk add --no-cache \

 # Download go dependencies
 WORKDIR /osmosis
-COPY go.mod go.sum ./


cc @niccoloraspa @p0mvn is there some more correct way I should be doing this?

AFAIU, we may actually be building against the wrong osmomath rn, since we can cache the osmomath copy.

We need it here though, since go mod download looks for a local osmomath replace

Commented below with suggestions, rest LGTM on a first pass

p0mvn · 2022-12-16T21:34:47Z

osmomath/go.mod

@@ -0,0 +1,89 @@
+module github.com/osmosis-labs/osmosis/osmomath


Can we suffix this with a version?

I think not having a version might contribute to import cycles and other import problems in the future

This is not 1.0 yet. We only need version suffixes once theres a 2.0

I don't see how we'd get import cycles, though we may get import problems due to API breaks and not tagging a new osmomath. (I feel not super worried about this though, as long as we tag a new osmomath at every osmosis major version or notable osmomath changes)

This opens up a discussion of the semantics of versioning for these submodules. What sort of changes are needed for a v2? is it any api breaking changes?

I think this depends on wether we have external users or not, but I'm almost leaning towards that projects importing this should target a specific commit in their go.mod. That way we don't have to worry about breaking changes for external users.

p0mvn · 2022-12-16T21:36:36Z

Dockerfile

@@ -19,7 +19,8 @@ RUN apk add --no-cache \

 # Download go dependencies
 WORKDIR /osmosis
-COPY go.mod go.sum ./
+COPY go.work go.mod go.sum ./
+COPY osmomath/ ./osmomath


Is it possible to only copy osmomath/go.mod and osmomath/go.sum here?

This is so that updates to osmomath code do not trigger wget for wasvm. Having only go.mod will allow that layer to be cached

Let me try this, but I believe the answer is no. This is because the main go.mod replaces it with a local folder path, rather than downloading this folder from a normal upstream mirror.

Though we could move all these copies until after the wasmvm wget, I don't understand why we do the go mod download before the wget

nicolaslara

Agree with moving the COPYs on the docker file and left a comment about versioning. But otherwise this LGTM

nicolaslara · 2022-12-19T13:48:59Z

Note/warning: when main gets merged into this branch, you'll have issues with the Exp2 tests using osmoassert.

This will be solved by making osmoutils its own module too

ValarDragon · 2022-12-19T16:30:25Z

Ok I tagged osmomath, and switched make build, make install and dockerfile to not use the go work, and instead depend on either tagged or hashpinned versions.

ValarDragon · 2022-12-21T20:45:18Z

Should now work per the discussed plan! Going to merge

* Move osmomath into its own go.mod * Fix go mods * fix osmomath test build * Tryfix e2e test * Try removing osmomath from the copy line? * Add osmomath to first copy * Try another layer * Make build work off of tagged releases * Switch prod and E2E builds to ignore go work * Fix merge conflict * Add root dir to go work * Fix conflict (cherry picked from commit 079702e) # Conflicts: # go.mod # go.sum # osmomath/decimal_test.go # osmomath/exp2_test.go # x/gamm/keeper/pool_service.go # x/gamm/pool-models/stableswap/pool_test.go # x/twap/logic.go # x/twap/strategy.go # x/twap/strategy_test.go

* Move osmomath into its own go.mod (#3771) * Move osmomath into its own go.mod * Fix go mods * fix osmomath test build * Tryfix e2e test * Try removing osmomath from the copy line? * Add osmomath to first copy * Try another layer * Make build work off of tagged releases * Switch prod and E2E builds to ignore go work * Fix merge conflict * Add root dir to go work * Fix conflict (cherry picked from commit 079702e) # Conflicts: # go.mod # go.sum # osmomath/decimal_test.go # osmomath/exp2_test.go # x/gamm/keeper/pool_service.go # x/gamm/pool-models/stableswap/pool_test.go # x/twap/logic.go # x/twap/strategy.go # x/twap/strategy_test.go * Tryfix conflicts * go mod tidy * Update to osmomath v0.0.2 * refactor(osmoutils): use Dec for additive tolerance instead of Int (#3711) * refactor(osmoutils): use Dec for additive tolerance instead of Int * changelog (cherry picked from commit 5ab7ebf) # Conflicts: # CHANGELOG.md # osmomath/binary_search.go # x/gamm/pool-models/balancer/pool_test.go # x/gamm/pool-models/internal/cfmm_common/lp.go # x/gamm/pool-models/stableswap/amm.go # x/gamm/pool-models/stableswap/amm_test.go * tryfix conflict Co-authored-by: Dev Ojha <[email protected]> Co-authored-by: Dev Ojha <[email protected]> Co-authored-by: Roman <[email protected]>

Move osmomath into its own go.mod

68f4a39

ValarDragon added V:state/compatible/backport State machine compatible PR, should be backported A:backport/v13.x backport patches to v13.x branch labels Dec 16, 2022

github-actions bot added C:app-wiring Changes to the app folder C:x/gamm Changes, features and bugs related to the gamm module. C:x/twap Changes to the twap module labels Dec 16, 2022

ValarDragon added 3 commits December 16, 2022 14:59

Fix go mods

490e663

fix osmomath test build

f0e1bec

Tryfix e2e test

00cf73f

github-actions bot added the T:build label Dec 16, 2022

ValarDragon added 2 commits December 16, 2022 15:06

Try removing osmomath from the copy line?

ebc4bfa

Add osmomath to first copy

b0558d6

ValarDragon commented Dec 16, 2022

View reviewed changes

Try another layer

3db2ef8

p0mvn reviewed Dec 16, 2022

View reviewed changes

ValarDragon requested a review from nicolaslara December 17, 2022 05:42

nicolaslara approved these changes Dec 19, 2022

View reviewed changes

nicolaslara mentioned this pull request Dec 19, 2022

Move osmoutils into own mod #3788

Closed

ValarDragon and others added 4 commits December 19, 2022 10:12

Make build work off of tagged releases

d61ca91

Switch prod and E2E builds to ignore go work

542f159

Merge branch 'main' into dev/move_osmomath_into_own_mod

4f8169d

Fix merge conflict

8c0745d

ValarDragon added 4 commits December 19, 2022 10:31

Add root dir to go work

1eb3d79

Merge branch 'main' into dev/move_osmomath_into_own_mod

a9bff81

Merge branch 'main' into dev/move_osmomath_into_own_mod

dda78f2

Fix conflict

928ffdb

ValarDragon merged commit 079702e into main Dec 21, 2022

ValarDragon deleted the dev/move_osmomath_into_own_mod branch December 21, 2022 20:52

mergify bot mentioned this pull request Dec 21, 2022

Move osmomath into its own go.mod (backport #3771) #3816

Merged

github-actions bot mentioned this pull request Mar 1, 2024

Broken Links Detected #7641

Closed

github-actions bot mentioned this pull request May 15, 2024

Broken Links Detected #8269

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move osmomath into its own go.mod #3771

Move osmomath into its own go.mod #3771

ValarDragon commented Dec 16, 2022 •

edited

Loading

ValarDragon Dec 16, 2022

p0mvn Dec 16, 2022

p0mvn Dec 16, 2022

ValarDragon Dec 16, 2022 •

edited

Loading

nicolaslara Dec 19, 2022

p0mvn Dec 16, 2022

ValarDragon Dec 16, 2022

nicolaslara left a comment

nicolaslara commented Dec 19, 2022

ValarDragon commented Dec 19, 2022

ValarDragon commented Dec 21, 2022

		@@ -0,0 +1,89 @@
		module github.com/osmosis-labs/osmosis/osmomath

Move osmomath into its own go.mod #3771

Move osmomath into its own go.mod #3771

Conversation

ValarDragon commented Dec 16, 2022 • edited Loading

What is the purpose of the change

Brief Changelog

Testing and Verifying

Documentation and Release Note

ValarDragon Dec 16, 2022

Choose a reason for hiding this comment

p0mvn Dec 16, 2022

Choose a reason for hiding this comment

p0mvn Dec 16, 2022

Choose a reason for hiding this comment

ValarDragon Dec 16, 2022 • edited Loading

Choose a reason for hiding this comment

nicolaslara Dec 19, 2022

Choose a reason for hiding this comment

p0mvn Dec 16, 2022

Choose a reason for hiding this comment

ValarDragon Dec 16, 2022

Choose a reason for hiding this comment

nicolaslara left a comment

Choose a reason for hiding this comment

nicolaslara commented Dec 19, 2022

ValarDragon commented Dec 19, 2022

ValarDragon commented Dec 21, 2022

ValarDragon commented Dec 16, 2022 •

edited

Loading

ValarDragon Dec 16, 2022 •

edited

Loading