Merge pull request #321 from Superlogic/patch/tezos-config

DA-608 Update tezosconnect volumes
hyperledger · Aug 22, 2024 · a459b82 · a459b82
2 parents c05e5ee + 9268f67
commit a459b82
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/internal/blockchain/tezos/connector/tezosconnect/config.go b/internal/blockchain/tezos/connector/tezosconnect/config.go
@@ -67,7 +67,8 @@ type FFCoreConfig struct {
 }
 
 type ConfirmationsConfig struct {
-	Required *int `yaml:"required,omitempty"`
+	Required              *int `yaml:"required,omitempty"`
+	FetchReceiptUponEntry bool `yaml:"fetchReceiptUponEntry,omitempty"`
 }
 
 func (c *Config) WriteConfig(filename string, extraTezosconnectConfigPath string) error {
@@ -133,7 +134,7 @@ func (t *Tezosconnect) GenerateConfig(stack *types.Stack, org *types.Organizatio
 		},
 		Persistence: &PersistenceConfig{
 			LevelDB: &LevelDBConfig{
-				Path: "/tezosconnect/leveldb",
+				Path: "/tezosconnect/db/leveldb",
 			},
 		},
 		FFCore: &FFCoreConfig{
@@ -142,7 +143,8 @@ func (t *Tezosconnect) GenerateConfig(stack *types.Stack, org *types.Organizatio
 		},
 		Metrics: metrics,
 		Confirmations: &ConfirmationsConfig{
-			Required: confirmations,
+			Required:              confirmations,
+			FetchReceiptUponEntry: true,
 		},
 	}
 }

diff --git a/internal/blockchain/tezos/connector/tezosconnect/docker.go b/internal/blockchain/tezos/connector/tezosconnect/docker.go
@@ -30,24 +30,24 @@ func (t *Tezosconnect) GetServiceDefinitions(s *types.Stack, dependentServices m
 	}
 	serviceDefinitions := make([]*docker.ServiceDefinition, len(s.Members))
 	for i, member := range s.Members {
+		dataVolumeName := fmt.Sprintf("tezosconnect_data_%s", member.ID)
 		serviceDefinitions[i] = &docker.ServiceDefinition{
 			ServiceName: "tezosconnect_" + member.ID,
 			Service: &docker.Service{
 				Image:         s.VersionManifest.Tezosconnect.GetDockerImageString(),
 				ContainerName: fmt.Sprintf("%s_tezosconnect_%v", s.Name, i),
-				Command:       "-f /tezosconnect/config/config.yaml",
+				Command:       "-f /tezosconnect/config.yaml",
 				DependsOn:     dependsOn,
 				Ports:         []string{fmt.Sprintf("%d:%v", member.ExposedConnectorPort, t.Port())},
 				Volumes: []string{
-					fmt.Sprintf("tezosconnect_config_%s:/tezosconnect/config", member.ID),
-					fmt.Sprintf("tezosconnect_leveldb_%s:/tezosconnect/leveldb", member.ID),
+					fmt.Sprintf("%s/config/tezosconnect_%s.yaml:/tezosconnect/config.yaml", s.RuntimeDir, member.ID),
+					fmt.Sprintf("%s:/tezosconnect/db", dataVolumeName),
 				},
 				Logging:     docker.StandardLogOptions,
 				Environment: s.EnvironmentVars,
 			},
 			VolumeNames: []string{
-				fmt.Sprintf("tezosconnect_config_%s", member.ID),
-				fmt.Sprintf("tezosconnect_leveldb_%s", member.ID),
+				dataVolumeName,
 			},
 		}
 	}

diff --git a/internal/blockchain/tezos/connector/tezosconnect/docker_test.go b/internal/blockchain/tezos/connector/tezosconnect/docker_test.go
@@ -83,7 +83,7 @@ func TestGetServiceDefinition(t *testing.T) {
 			serviceDefinitions := tezos.GetServiceDefinitions(tc.Members, tc.DependentServices)
 			assert.NotNil(t, serviceDefinitions)
 
-			expectedCommand := "-f /tezosconnect/config/config.yaml"
+			expectedCommand := "-f /tezosconnect/config.yaml"
 			if serviceDefinitions[0].Service.Command != expectedCommand {
 				t.Errorf("Expected Command %q, got %q", expectedCommand, serviceDefinitions[0].Service.Command)
 			}