Skip to content

Conversation

sophia1ch
Copy link
Contributor

Description

This PR extends PR #410 and removes the channelID map. This is no longer necessary, as we can use one encoding for all backends and contracts to calculate the channelID.

feat(Asset, Adjudicator): Add AssetID struct to identify assets with LedgerID and BackendID
feat(persistence, wire): Use map[int]Address to identify clients

Signed-off-by: Sophia Koehler <sophia@perun.network>
…and adjudicators.

fix(randomizer): Lookup backend opts to correctly initialize address maps.
fix(test): Generalize tests to be used in other backends.

Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
fix(wallet/wallet, wallet/account): Revert changed definition.
feat(client): Add wallet map to client for each backend.

Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
feat(client/test, wire): Add backendID arguments.

Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
…t, ): Specify backend for randomizers

feat(channel/multi): Change AssetID to interface
feat(channel/persistence, client/test): Generalize test for backends

Signed-off-by: Sophia Koehler <sophia@perun.network>
…ad of string.

fix(params.go): Change IDKey to encode map entries sorted by keys.
fix(backend.go): Use BackendID in argument to sign depending on backend.
fix(address.go): Sort Addresses by keys before adding them to Keys.

Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
…n of errors

chore(All): Run gofmt and sort imports

Signed-off-by: Sophia Koehler <sophia@perun.network>
chore: Refactor for linter

Signed-off-by: Sophia Koehler <sophia@perun.network>
fix(golangci): Fix structure

Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Revert "fix(all): Use map[int]ID instead of id for each backend."

This reverts commit ab8e60b and ef11de9

Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
…e): Name test backend ID in tests

refactor(/multi, /client/test): Rename AssetID to MultiLedgerID

Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
@sophia1ch sophia1ch requested a review from iljabvh January 20, 2025 12:40
Signed-off-by: Sophia Koehler <sophia@perun.network>
# Conflicts:
#	backend/sim/wallet/address.go
#	channel/allocation_test.go
#	channel/errors_internal_test.go
#	channel/persistence/statemachine_test.go
#	client/restore_internal_test.go
Signed-off-by: Sophia Koehler <sophia@perun.network>
fix(wire.pb.go): go fmt

Signed-off-by: Sophia Koehler <sophia@perun.network>
iljabvh
iljabvh previously approved these changes Jan 31, 2025
# Conflicts:
#	apps/payment/app_internal_test.go
#	apps/payment/randomizer.go
#	apps/payment/randomizer_internal_test.go
#	apps/payment/resolver_internal_test.go
#	backend/sim/channel/app.go
#	backend/sim/channel/asset.go
#	backend/sim/channel/backend.go
#	backend/sim/channel/channel_internal_test.go
#	backend/sim/channel/init.go
#	backend/sim/wallet/account.go
#	backend/sim/wallet/address.go
#	backend/sim/wallet/init.go
#	backend/sim/wallet/wallet.go
#	channel/actionmachine.go
#	channel/adjudicator.go
#	channel/allocation.go
#	channel/allocation_test.go
#	channel/app.go
#	channel/backend.go
#	channel/backendtest.go
#	channel/errors.go
#	channel/machine.go
#	channel/machine_test.go
#	channel/mock_app.go
#	channel/mock_app_internal_test.go
#	channel/multi/adjudicator.go
#	channel/multi/asset.go
#	channel/multi/funder.go
#	channel/multi/subscription.go
#	channel/params.go
#	channel/params_test.go
#	channel/persistence/keyvalue/cache.go
#	channel/persistence/keyvalue/persistedstate.go
#	channel/persistence/keyvalue/persister.go
#	channel/persistence/keyvalue/persistrestorer_internal_test.go
#	channel/persistence/keyvalue/restorer.go
#	channel/persistence/nonpersister.go
#	channel/persistence/persistence.go
#	channel/persistence/statemachine_test.go
#	channel/persistence/test/channel.go
#	channel/persistence/test/peerchans.go
#	channel/persistence/test/peerchans_internal_test.go
#	channel/persistence/test/persistrestorer.go
#	channel/persistence/test/persistrestorertest.go
#	channel/state.go
#	channel/statemachine.go
#	channel/test/app_randomizer.go
#	channel/test/backend.go
#	channel/test/mock_app_randomizer.go
#	channel/test/randomizer.go
#	channel/test/randomopts.go
#	channel/transaction_test.go
#	client/adjudicate.go
#	client/appchannel_test.go
#	client/channel.go
#	client/channelconn.go
#	client/chanregistry.go
#	client/client.go
#	client/client_internal_test.go
#	client/client_persistence_test.go
#	client/client_role_test.go
#	client/client_test.go
#	client/clientconn.go
#	client/failing_funding_test.go
#	client/payment_test.go
#	client/proposal.go
#	client/proposal_internal_test.go
#	client/proposalmsgs.go
#	client/restore.go
#	client/restore_internal_test.go
#	client/serialize.go
#	client/subchannel.go
#	client/subchannel_test.go
#	client/sync.go
#	client/syncmsgs.go
#	client/test/backend.go
#	client/test/channel.go
#	client/test/fund.go
#	client/test/handler.go
#	client/test/multiledger.go
#	client/test/multiledger_dispute.go
#	client/test/multiledger_happy.go
#	client/test/persistence.go
#	client/test/proposalmsgs.go
#	client/test/randomproposal.go
#	client/test/role.go
#	client/test/subchannel.go
#	client/test/subchannel_dispute.go
#	client/test/updatemsgs.go
#	client/test/virtualchannel.go
#	client/update.go
#	client/updateinterception.go
#	client/updatemsgs.go
#	client/virtual_channel.go
#	client/virtual_channel_settlement.go
#	client/virtual_channel_test.go
#	log/logrus/logrus_internal_test.go
#	wallet/address.go
#	wallet/address_test.go
#	wallet/backend.go
#	wallet/sig.go
#	wallet/test/randomizer.go
#	wallet/test/wallet.go
#	wallet/test/walletbench.go
#	watcher/local/adjudicatorpubsub.go
#	watcher/local/registry.go
#	watcher/local/statespubsub.go
#	watcher/local/watcher.go
#	watcher/local/watcher_test.go
#	watcher/watcher.go
#	wire/account.go
#	wire/address.go
#	wire/bus.go
#	wire/encode.go
#	wire/hybridbus.go
#	wire/hybridbus_test.go
#	wire/localbus.go
#	wire/localbus_test.go
#	wire/net/bus.go
#	wire/net/bus_test.go
#	wire/net/dialer.go
#	wire/net/endpoint.go
#	wire/net/endpoint_internal_test.go
#	wire/net/endpoint_registry.go
#	wire/net/endpoint_registry_external_test.go
#	wire/net/endpoint_registry_internal_test.go
#	wire/net/exchange_addr.go
#	wire/net/exchange_addr_internal_test.go
#	wire/net/simple/address.go
#	wire/net/simple/dialer.go
#	wire/net/simple/dialer_internal_test.go
#	wire/net/simple/simple_exchange_addr_test.go
#	wire/net/test/connhub.go
#	wire/net/test/connhub_internal_test.go
#	wire/net/test/dialer.go
#	wire/net/test/listenermap.go
#	wire/perunio/serializer/serializer.go
#	wire/perunio/test/serializertest.go
#	wire/protobuf/proposalmsgs.go
#	wire/protobuf/serializer.go
#	wire/protobuf/updatemsgs.go
#	wire/protobuf/wire.pb.go
#	wire/protobuf/wire.proto
#	wire/test/bustest.go
#	wire/test/msgstest.go
#	wire/test/randomizer.go
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
Signed-off-by: Sophia Koehler <sophia@perun.network>
@sophia1ch sophia1ch requested a review from iljabvh February 5, 2025 09:13
@sophia1ch sophia1ch merged commit 7af28d5 into hyperledger-labs:main Feb 11, 2025
7 checks passed
@sophia1ch sophia1ch deleted the remove-id-map branch February 11, 2025 12:09
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.

2 participants