Skip to content

Commit 21d973e

Browse files
authored
Merge pull request #5 from jshufro/jms/reorg
Rename some packages
2 parents a6ccc56 + 734def9 commit 21d973e

23 files changed

Lines changed: 31 additions & 31 deletions

generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ package main
22

33
//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.6.0 -config oapi-codegen/oapi-schemas.yaml remote-signing-api/signing/schemas.yaml
44
//go:generate go run github.com/oapi-codegen/oapi-codegen/v2/cmd/oapi-codegen@v2.6.0 -config oapi-codegen/oapi-codegen.yaml remote-signing-api/remote-signing-oapi.yaml
5-
//go:generate go run ./signablegen api remote-signing-api/signing/paths/sign.yaml internal/api/signables.gen.go
5+
//go:generate go run ./signablegen generated remote-signing-api/signing/paths/sign.yaml generated/signables.gen.go
Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"syscall"
1515

1616
"github.com/jshufro/remote-signer-dirk-interop/config"
17-
"github.com/jshufro/remote-signer-dirk-interop/internal/api"
17+
api "github.com/jshufro/remote-signer-dirk-interop/generated"
1818
"github.com/jshufro/remote-signer-dirk-interop/pkg/dirksigner"
1919
"github.com/jshufro/remote-signer-dirk-interop/pkg/service"
2020
tlsprovider "github.com/jshufro/remote-signer-dirk-interop/pkg/tls"

oapi-codegen/oapi-codegen-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ generate:
44
client: true
55
output: client/remote_signing_client.gen.go
66
import-mapping:
7-
../schemas.yaml: "github.com/jshufro/remote-signer-dirk-interop/internal/api"
7+
../schemas.yaml: "github.com/jshufro/remote-signer-dirk-interop/generated"
88
output-options:
99
skip-prune: true
1010
prefer-skip-optional-pointer: true

oapi-codegen/oapi-codegen.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package: api
1+
package: generated
22
generate:
33
models: true
44
std-http-server: true
5-
output: internal/api/remote_signing.gen.go
5+
output: generated/remote_signing.gen.go
66
import-mapping:
77
../schemas.yaml: "-"
88
output-options:

oapi-codegen/oapi-schemas.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package: api
1+
package: generated
22
generate:
33
models: true
4-
output: internal/api/schemas.gen.go
4+
output: generated/schemas.gen.go
55
output-options:
66
skip-prune: true
77
prefer-skip-optional-pointer: true

pkg/dirksigner/dirk-signer.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"github.com/attestantio/go-eth2-client/spec/phase0"
1515
ssz "github.com/ferranbt/fastssz"
1616
"github.com/herumi/bls-eth-go-binary/bls"
17-
"github.com/jshufro/remote-signer-dirk-interop/internal/api"
18-
"github.com/jshufro/remote-signer-dirk-interop/internal/domains"
19-
"github.com/jshufro/remote-signer-dirk-interop/internal/errors"
17+
api "github.com/jshufro/remote-signer-dirk-interop/generated"
2018
"github.com/jshufro/remote-signer-dirk-interop/pkg/dirksigner/dirk"
19+
"github.com/jshufro/remote-signer-dirk-interop/pkg/domains"
20+
"github.com/jshufro/remote-signer-dirk-interop/pkg/errors"
2121
"github.com/jshufro/remote-signer-dirk-interop/pkg/signer"
2222
tlsprovider "github.com/jshufro/remote-signer-dirk-interop/pkg/tls"
2323

0 commit comments

Comments
 (0)