fix

simulation/Makefile

@@ -1,5 +1,11 @@
 .PHONY: run push-to-ecr build-client
 
+#### Local simulation ####
+## run-single: Run bundled simulation where client and server are in the same process
+run-single:
+	@echo "Running singe process simulation..."
+	go run ./local/single-process/main.go
+
 #### Remote simulation ####
 
 # Default values for optional variables

simulation/local/process-per-client/main.go

@@ -28,7 +28,7 @@ const (
 
 var (
 	clients   = make(map[string]*ClientConnection)
-	clientsMu sync.Mutex // Protects the clients map
+	clientsMu sync.Mutex
 	upgrader  = websocket.Upgrader{}
 )
 

simulation/local/single-process/main.go

@@ -31,7 +31,7 @@ var (
 )
 
 func main() {
-	simFile := flag.String("simulation", "simulation2.yaml", "Path to the simulation YAML file")
+	simFile := flag.String("simulation", "simulation.yaml", "Path to the simulation YAML file")
 	flag.Parse()
 
 	simulation, err := loadAndValidateSimulation(*simFile)

simulation/remote/client/main.go

@@ -55,7 +55,7 @@ func main() {
 	}
 
 	// Listen for commands from orchestrator
-	client.listenForCommands()
+	client.listenForCommands(orchestratorUrl)
 }
 
 // setupArkClient initializes the ArkClient for the client.
@@ -137,7 +137,7 @@ func (c *Client) sendAddress() error {
 }
 
 // listenForCommands listens for commands from the orchestrator.
-func (c *Client) listenForCommands() {
+func (c *Client) listenForCommands(orchestratorUrl string) {
 	defer c.Conn.Close()
 	for {
 		select {
@@ -152,13 +152,13 @@ func (c *Client) listenForCommands() {
 				return
 			}
 			// Handle the command
-			c.handleCommand(command)
+			c.handleCommand(orchestratorUrl, command)
 		}
 	}
 }
 
 // handleCommand processes a command received from the orchestrator.
-func (c *Client) handleCommand(command Command) {
+func (c *Client) handleCommand(orchestratorUrl string, command Command) {
 	switch command.Type {
 	case "Onboard":
 		amount, ok := command.Data["amount"].(float64)
@@ -181,7 +181,7 @@ func (c *Client) handleCommand(command Command) {
 			c.sendError("Invalid recipient in SendAsync command")
 			return
 		}
-		err := c.sendAsync(amount, toClientID)
+		err := c.sendAsync(amount, orchestratorUrl, toClientID)
 		if err != nil {
 			c.sendError(fmt.Sprintf("SendAsync failed: %v", err))
 		}
@@ -248,11 +248,11 @@ func (c *Client) onboard(amount float64) error {
 }
 
 // sendAsync sends funds asynchronously to another client.
-func (c *Client) sendAsync(amount float64, toClientID string) error {
+func (c *Client) sendAsync(amount float64, orchestratorUrl, toClientID string) error {
 	ctx := context.Background()
 
 	// Request recipient address from orchestrator
-	recipientAddress, err := c.requestRecipientAddress(toClientID)
+	recipientAddress, err := c.requestRecipientAddress(orchestratorUrl, toClientID)
 	if err != nil {
 		return err
 	}
@@ -321,7 +321,7 @@ func (c *Client) sendLog(message string) {
 }
 
 // requestRecipientAddress requests the recipient's address from the orchestrator.
-func (c *Client) requestRecipientAddress(toClientID string) (string, error) {
+func (c *Client) requestRecipientAddress(orchestratorUrl, toClientID string) (string, error) {
 	resp, err := http.Get(fmt.Sprintf("http://localhost:9000/address?client_id=%s", toClientID))
 	if err != nil {
 		return "", err

simulation/remote/infra/cloudformation.yaml

@@ -259,7 +259,7 @@ Resources:
           nigiri start
 
           echo "Running make push-to-ecr..."
-          make push-to-ecr AWS_ACCOUNT_ID=\$AWS_ACCOUNT_ID AWS_REGION=\$AWS_REGION
+          cd simulation & make push-to-ecr AWS_ACCOUNT_ID=\$AWS_ACCOUNT_ID AWS_REGION=\$AWS_REGION
 
           EOF