Skip to content

Conversation

samlaf
Copy link
Collaborator

@samlaf samlaf commented Jul 17, 2025

Pulls in latest PR on proxy repo: Layr-Labs/eigenda-proxy#422

I think I made a mistake and squash merged #1611, because subtree pull was giving me this error (same when trying with --squash):

$ git subtree pull --prefix=api/proxy https://github.com/Layr-Labs/eigenda-proxy.git main --squash
From https://github.com/Layr-Labs/eigenda-proxy
 * branch              main       -> FETCH_HEAD
fatal: can't squash-merge: 'api/proxy' was never added.

But TIL that git is smart when cherry-picking and has a directory-rename feature, so the changes were automatically applied to the files under api/proxy, except for 2 small weirdness:

  • golangci.lint file was conflicting with root golangci file.. so had to fix conflict by hand
  • the new testutil/utils.go file behaved very weirdly.. was saying there was a conflict even though it was just getting added and we didn't already have that file... not super sure but just commited it "with conflicts" and everything was fine.

* Write on cache miss flag

* Fix category

* Update help

* Update docs/help_out.txt

Co-authored-by: Samuel Laferriere <[email protected]>

* Update flag doc

* Add e2e test for WriteOnCacheMiss flag

* Fix lint

---------

Co-authored-by: Samuel Laferriere <[email protected]>
@samlaf samlaf requested a review from a team as a code owner July 17, 2025 13:18
litt3
litt3 previously approved these changes Jul 17, 2025
@@ -17,7 +17,7 @@ linters:
- unused # checks for unused constants, variables, functions and types
## disabled by default
- asasalint # checks for pass []any as any in variadic func(...any)
- asciicheck # checks that your code does not contain non-ASCII identifiers
- asciicheck # checks that your code does not contain non-ASCII identifiers1
Copy link
Contributor

Choose a reason for hiding this comment

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

stray keystroke

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@@ -195,7 +195,7 @@ linters:
- unparam

# Allow certain patterns to be ignored by lll (long lines)
- source: '".{120,}"' # Ignores double-quoted strings longer than 120 chars
- source: '".{100,}"' # Ignores double-quoted strings longer than 120 chars
Copy link
Contributor

Choose a reason for hiding this comment

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

Not in favor of this change

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I know... but otherwise there was a bug which the celo engineer was running into and he didn't find another way to solve it. See https://eigenlabs.slack.com/archives/C07614NNXDH/p1751913947976629?thread_ts=1750965737.272329&cid=C07614NNXDH

Copy link
Collaborator Author

@samlaf samlaf Jul 17, 2025

Choose a reason for hiding this comment

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

Fixed comment and added some "explanation" in 2c50038
Tbf I don't understand the bug so not super sure... but its not super important to me we can keep tweaking this in another PR I think, given that this blocks the 2.1 release we're trying to achieve and I want this to be included.

@samlaf samlaf requested a review from litt3 July 17, 2025 17:02
@samlaf samlaf merged commit edecb65 into master Jul 17, 2025
28 checks passed
@samlaf samlaf deleted the chore--pull-latest-proxy-changes branch July 17, 2025 18:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants