From 92ad4d085f9c6eb96cda5a3a8a2dbd5bdae84670 Mon Sep 17 00:00:00 2001
From: Sacha Froment <sfroment42@gmail.com>
Date: Tue, 23 Oct 2018 15:31:07 +0200
Subject: [PATCH] fix(core): fix transport start flag

Signed-off-by: Sacha Froment <sfroment42@gmail.com>
---
 core/cmd/berty/daemon.go        |  1 +
 core/manager/account/account.go |  3 ---
 core/manager/account/options.go |  3 +++
 core/manager/account/p2p.go     | 11 ++++++++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/core/cmd/berty/daemon.go b/core/cmd/berty/daemon.go
index d250788aac..6fbf3d5eed 100644
--- a/core/cmd/berty/daemon.go
+++ b/core/cmd/berty/daemon.go
@@ -93,6 +93,7 @@ func daemon(opts *daemonOptions) error {
 		accountOptions = append(accountOptions, account.WithP2PNetwork(
 			&account.P2PNetworkOptions{
 				Bind:      opts.bindP2P,
+				Transport: opts.transportP2P,
 				Bootstrap: opts.bootstrap,
 				MDNS:      opts.mdns,
 				Relay:     opts.hop,
diff --git a/core/manager/account/account.go b/core/manager/account/account.go
index 490fa5eb05..891b3d1d25 100644
--- a/core/manager/account/account.go
+++ b/core/manager/account/account.go
@@ -88,9 +88,6 @@ func (a *Account) Validate() error {
 }
 
 func (a *Account) Open() error {
-	if err := a.openDatabase(); err != nil {
-		return err
-	}
 	if err := a.initNode(); err != nil {
 		return err
 	}
diff --git a/core/manager/account/options.go b/core/manager/account/options.go
index 415258bf5b..0505739474 100644
--- a/core/manager/account/options.go
+++ b/core/manager/account/options.go
@@ -65,6 +65,9 @@ func WithDatabase(opts *DatabaseOptions) NewOption {
 		}
 
 		a.dbDrop = opts.Drop
+		if err := a.openDatabase(); err != nil {
+			return err
+		}
 		return nil
 	}
 }
diff --git a/core/manager/account/p2p.go b/core/manager/account/p2p.go
index fee85d51cb..2c6f00f6e5 100644
--- a/core/manager/account/p2p.go
+++ b/core/manager/account/p2p.go
@@ -11,6 +11,7 @@ import (
 
 type P2PNetworkOptions struct {
 	Bind             []string
+	Transport        []string
 	Bootstrap        []string
 	DefaultBootstrap bool
 	MDNS             bool
@@ -61,11 +62,19 @@ func WithP2PNetwork(opts *P2PNetworkOptions) NewOption {
 			identity = p2p.WithIdentity(prvKey)
 		}
 
+		for _, v := range opts.Transport {
+			switch v {
+			case "default":
+				p2pOptions = append(p2pOptions, p2p.WithDefaultTransports())
+			case "ble":
+				p2pOptions = append(p2pOptions, p2p.WithTransportBle(opts.Bind, a.db))
+			}
+		}
+
 		p2pOptions = append(p2pOptions,
 			p2p.WithDefaultMuxers(),
 			p2p.WithDefaultPeerstore(),
 			p2p.WithDefaultSecurity(),
-			p2p.WithDefaultTransports(),
 			// @TODO: Allow static identity loaded from a file (useful for relay
 			// server for creating static endpoint for bootstrap)
 			// p2p.WithIdentity(<key>),