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.

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

chore: remove baseapp from x/accounts #23355

Merged
merged 56 commits into from
Jan 16, 2025
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
dab4f61
header service
Dec 20, 2024
ccdbad4
update
Dec 20, 2024
ef438eb
basic env
Dec 20, 2024
9dfae05
transaction service
Dec 20, 2024
779bd84
refit
Dec 20, 2024
2e7ca6d
register
Dec 20, 2024
6161b6a
utd
Dec 20, 2024
7355259
Merge branch 'main' into feat/services-helpers
Dec 20, 2024
46a30d3
bank
Dec 20, 2024
89e5b26
no more sdk.context
Dec 20, 2024
05a8577
working
Dec 20, 2024
f827e73
lint fixes
Dec 20, 2024
6c7dc2a
format
Dec 20, 2024
ed63aca
Merge branch 'main' into feat/services-helpers
Jan 3, 2025
c8b7460
Merge branch 'main' into feat/services-helpers
Jan 3, 2025
4956083
lint
Jan 3, 2025
b5703d4
Merge branch 'main' into feat/services-helpers
Jan 3, 2025
c7bc69d
tidy all
Jan 3, 2025
1442dc2
Merge branch 'main' into feat/services-helpers
Jan 6, 2025
9d98953
Merge branch 'main' into feat/services-helpers
Jan 6, 2025
d29ed65
Merge branch 'main' into feat/services-helpers
Jan 6, 2025
d42ac1f
clean
Jan 6, 2025
a6ffa04
use mocked query client
Jan 6, 2025
fb55664
clean up
Jan 6, 2025
87fb4f9
lint
Jan 6, 2025
e18d809
server check
Jan 6, 2025
4f56126
Merge branch 'main' into feat/services-helpers
Jan 7, 2025
f67b33f
lint-fix
Jan 7, 2025
997bf85
Merge branch 'main' into feat/services-helpers
Jan 7, 2025
ed61ace
Merge branch 'main' into feat/services-helpers
Jan 7, 2025
47a681e
init test
Jan 8, 2025
9f54324
rm
Jan 8, 2025
0cea6dd
Merge branch 'main' into feat/services-helpers
Jan 8, 2025
1838bbf
Update testutil/queryclient/queryclient.go
Jan 9, 2025
31198b6
Merge branch 'main' into feat/services-helpers
Jan 9, 2025
e932ea5
q
Jan 9, 2025
d17569e
Merge branch 'main' into feat/services-helpers
Jan 9, 2025
71ad965
Merge branch 'main' into feat/services-helpers
Jan 9, 2025
4069c71
Merge branch 'main' into feat/services-helpers
Jan 13, 2025
d759e14
move out of intrgration
Jan 13, 2025
d8b3ac6
rearrange
Jan 13, 2025
150df47
lint fix
Jan 13, 2025
86269ec
clean
Jan 13, 2025
ffde8e3
clean
Jan 13, 2025
6574b36
Merge branch 'main' into chore/remove-baseapp-accounts
Jan 14, 2025
b5cf3af
Merge branch 'main' into chore/remove-baseapp-accounts
Jan 14, 2025
1138fc9
Merge branch 'main' into chore/remove-baseapp-accounts
Jan 14, 2025
6caaa63
refactgor into coretesting
Jan 14, 2025
d444dd7
Merge branch 'main' into chore/remove-baseapp-accounts
Jan 14, 2025
1b9b8f7
refactor
Jan 14, 2025
eda6e7f
Merge branch 'main' into chore/remove-baseapp-accounts
Jan 15, 2025
47bdcde
clean
Jan 15, 2025
5d14883
fix
Jan 15, 2025
615d930
Merge branch 'main' into chore/remove-baseapp-accounts
Jan 15, 2025
f88a742
Merge branch 'main' into chore/remove-baseapp-accounts
Jan 15, 2025
a913205
Merge branch 'main' into chore/remove-baseapp-accounts
Jan 16, 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
Prev Previous commit
Next Next commit
q
aljo242 committed Jan 9, 2025

Verified

This commit was signed with the committer’s verified signature.
the-praxs Pratyush Shukla
commit e932ea5719b1ae445abf4e54a6807f7fee6dec9d
18 changes: 9 additions & 9 deletions testutil/queryclient/queryclient.go
Original file line number Diff line number Diff line change
@@ -76,8 +76,8 @@ type GRPCQueryHandler = func(ctx context.Context, req *abci.QueryRequest) (*abci

// Route returns the GRPCQueryHandler for a given query route path or nil
// if not found
func (qrt *QueryHelper) Route(path string) GRPCQueryHandler {
handler, found := qrt.routes[path]
func (q *QueryHelper) Route(path string) GRPCQueryHandler {
handler, found := q.routes[path]
if !found {
return nil
}
@@ -89,35 +89,35 @@ func (qrt *QueryHelper) Route(path string) GRPCQueryHandler {
//
// This functions PANICS:
// - if a protobuf service is registered twice.
func (qrt *QueryHelper) RegisterService(sd *grpc.ServiceDesc, handler interface{}) {
func (q *QueryHelper) RegisterService(sd *grpc.ServiceDesc, handler interface{}) {
// adds a top-level query handler based on the gRPC service name
for _, method := range sd.Methods {
qrt.registerABCIQueryHandler(sd, method, handler)
q.registerABCIQueryHandler(sd, method, handler)
}
}

func (qrt *QueryHelper) registerABCIQueryHandler(sd *grpc.ServiceDesc, method grpc.MethodDesc, handler interface{}) {
func (q *QueryHelper) registerABCIQueryHandler(sd *grpc.ServiceDesc, method grpc.MethodDesc, handler interface{}) {
fqName := fmt.Sprintf("/%s/%s", sd.ServiceName, method.MethodName)
methodHandler := method.Handler

_, found := qrt.routes[fqName]
_, found := q.routes[fqName]
if found {
panic(fmt.Sprintf("handler for %s already registered", fqName))
}

qrt.routes[fqName] = func(ctx context.Context, req *abci.QueryRequest) (*abci.QueryResponse, error) {
q.routes[fqName] = func(ctx context.Context, req *abci.QueryRequest) (*abci.QueryResponse, error) {
// call the method handler from the service description with the handler object,
// a wrapped sdk.Context with proto-unmarshaled data from the ABCI request data
res, err := methodHandler(handler, ctx, func(i interface{}) error {
return qrt.cdc.Unmarshal(req.Data, i)
return q.cdc.Unmarshal(req.Data, i)
}, nil)
if err != nil {
return nil, err
}

// proto marshal the result bytes
var resBytes []byte
resBytes, err = qrt.cdc.Marshal(res)
resBytes, err = q.cdc.Marshal(res)
if err != nil {
return nil, err
}