Skip to content

Commit

Permalink
Reconcile
Browse files Browse the repository at this point in the history
Signed-off-by: Jim Zhang <[email protected]>
  • Loading branch information
jimthematrix committed Sep 13, 2024
1 parent 7079eb5 commit b8f5f9e
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
1 change: 0 additions & 1 deletion core/java/src/test/java/io/kaleido/paladin/TestDomain.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public class TestDomain extends DomainInstance {
@Override
protected CompletableFuture<ToDomain.ConfigureDomainResponse> configureDomain(ToDomain.ConfigureDomainRequest request) {
ToDomain.DomainConfig domainConfig = ToDomain.DomainConfig.newBuilder()
.setFactoryContractAddress("0x1000000000000000000000000000000000000001")
.setBaseLedgerSubmitConfig(ToDomain.BaseLedgerSubmitConfig.newBuilder()
.setSubmitMode(ToDomain.BaseLedgerSubmitConfig.Mode.ONE_TIME_USE_KEYS)
.build())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package io.kaleido.paladin;

import io.kaleido.paladin.toolkit.Testbed;
import io.kaleido.paladin.toolkit.JsonHex;
import org.junit.jupiter.api.Test;

import java.util.HashMap;
Expand All @@ -35,10 +36,12 @@ void runTestbed() throws Exception {
new Testbed.Setup("../go/db/migrations/sqlite", 5000),
new Testbed.ConfigDomain(
"domain1",
JsonHex.Address.addressFrom("0x1234567890abcdef1234567890abcdef12345678"),
new Testbed.ConfigPlugin("c-shared", "starter", ""),
new HashMap<>()),
new Testbed.ConfigDomain(
"domain2",
JsonHex.Address.addressFrom("0x1234567890abcdef1234567890abcdef12345678"),
new Testbed.ConfigPlugin("jar", "", TestDomainFactory.class.getName()),
new HashMap<>())
);
Expand Down
6 changes: 3 additions & 3 deletions domains/noto/internal/noto/e2e_noto_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ func newTestDomain(t *testing.T, domainName string, config *types.Config) (conte
})
url, done, err := tb.StartForTest("../../testbed.config.yaml", map[string]*testbed.TestbedDomain{
domainName: {
Config: mapConfig(t, config),
Plugin: plugin,
FactoryAddress: tktypes.MustEthAddress(config.FactoryAddress),
Config: mapConfig(t, config),
Plugin: plugin,
RegistryAddress: tktypes.MustEthAddress(config.FactoryAddress),
},
})
require.NoError(t, err)
Expand Down
3 changes: 1 addition & 2 deletions domains/noto/internal/noto/noto.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ func (n *Noto) ConfigureDomain(ctx context.Context, req *pb.ConfigureDomainReque

return &pb.ConfigureDomainResponse{
DomainConfig: &pb.DomainConfig{
FactoryContractAddress: config.FactoryAddress,
AbiStateSchemasJson: []string{string(schemaJSON)},
AbiStateSchemasJson: []string{string(schemaJSON)},
BaseLedgerSubmitConfig: &pb.BaseLedgerSubmitConfig{
SubmitMode: pb.BaseLedgerSubmitConfig_ENDORSER_SUBMISSION,
},
Expand Down
2 changes: 1 addition & 1 deletion domains/test/pvp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func newNotoDomain(t *testing.T, config *types.Config) (*noto.Noto, *testbed.Tes
domain = noto.New(callbacks)
return domain
}),
FactoryAddress: tktypes.MustEthAddress(config.FactoryAddress),
RegistryAddress: tktypes.MustEthAddress(config.FactoryAddress),
}
}

Expand Down
6 changes: 3 additions & 3 deletions domains/zeto/integration-test/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,9 @@ func newTestDomain(t *testing.T, domainName string, domainContracts *zetoDomainC
})
url, done, err := tb.StartForTest("./testbed.config.yaml", map[string]*testbed.TestbedDomain{
domainName: {
Config: mapConfig(t, config),
Plugin: plugin,
FactoryAddress: domainContracts.factoryAddress,
Config: mapConfig(t, config),
Plugin: plugin,
RegistryAddress: domainContracts.factoryAddress,
},
})
require.NoError(t, err)
Expand Down
3 changes: 1 addition & 2 deletions domains/zeto/internal/zeto/zeto.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ func (z *Zeto) ConfigureDomain(ctx context.Context, req *pb.ConfigureDomainReque

return &pb.ConfigureDomainResponse{
DomainConfig: &pb.DomainConfig{
FactoryContractAddress: config.FactoryAddress,
AbiStateSchemasJson: []string{string(schemaJSON)},
AbiStateSchemasJson: []string{string(schemaJSON)},
BaseLedgerSubmitConfig: &pb.BaseLedgerSubmitConfig{
SubmitMode: pb.BaseLedgerSubmitConfig_ENDORSER_SUBMISSION,
},
Expand Down

0 comments on commit b8f5f9e

Please sign in to comment.