Merge pull request #854 from smartcontractkit/chore/integrate_viper

Integrate Viper
smartcontractkit · Jan 3, 2019 · 75c0ec5 · 75c0ec5
2 parents fe804d1 + 09c1b2c
commit 75c0ec5
Show file tree

Hide file tree

Showing 39 changed files with 611 additions and 333 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -137,3 +137,7 @@
 [[constraint]]
   name = "github.com/golang/mock"
   version = "1.2.0"
+
+[[constraint]]
+  name = "github.com/spf13/viper.git"
+  version = "1.3.1"
diff --git a/adapters/adapter.go b/adapters/adapter.go
@@ -59,15 +59,15 @@ func (p PipelineAdapter) MinConfs() uint64 {
 }
 
 // MinContractPayment returns the private attribute
-func (p PipelineAdapter) MinContractPayment() assets.Link {
-	return p.minContractPayment
+func (p PipelineAdapter) MinContractPayment() *assets.Link {
+	return &p.minContractPayment
 }
 
 // For determines the adapter type to use for a given task.
 func For(task models.TaskSpec, store *store.Store) (*PipelineAdapter, error) {
 	var ba BaseAdapter
 	var err error
-	mic := store.Config.MinIncomingConfirmations
+	mic := store.Config.MinIncomingConfirmations()
 	mcp := *assets.NewLink(0)
 
 	switch task.Type {
@@ -88,7 +88,7 @@ func For(task models.TaskSpec, store *store.Store) (*PipelineAdapter, error) {
 		err = unmarshalParams(task.Params, ba)
 	case TaskTypeEthTx:
 		ba = &EthTx{}
-		mcp = store.Config.MinimumContractPayment
+		mcp = *store.Config.MinimumContractPayment()
 		err = unmarshalParams(task.Params, ba)
 	case TaskTypeHTTPGet:
 		ba = &HTTPGet{}

diff --git a/adapters/adapter_test.go b/adapters/adapter_test.go
@@ -40,7 +40,7 @@ func TestAdapterFor(t *testing.T) {
 	}{
 		{"adapter not found", "nonExistent", "<nil>", nil, true},
 		{"noop", "NoOp", "*adapters.NoOp", assets.NewLink(0), false},
-		{"ethtx", "EthTx", "*adapters.EthTx", &store.Config.MinimumContractPayment, false},
+		{"ethtx", "EthTx", "*adapters.EthTx", store.Config.MinimumContractPayment(), false},
 		{"bridge mixed case", "rideShare", "*adapters.Bridge", assets.NewLink(10), false},
 		{"bridge lower case", "rideshare", "*adapters.Bridge", assets.NewLink(10), false},
 	}
@@ -54,7 +54,7 @@ func TestAdapterFor(t *testing.T) {
 			} else {
 				assert.NoError(t, err)
 				assert.Equal(t, test.wantType, reflect.TypeOf(adapter.BaseAdapter).String())
-				assert.Equal(t, *test.wantMinContractPayment, adapter.MinContractPayment())
+				assert.Equal(t, test.wantMinContractPayment, adapter.MinContractPayment())
 			}
 		})
 	}

diff --git a/adapters/bridge.go b/adapters/bridge.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
+	"net/url"
 
 	"github.com/smartcontractkit/chainlink/store"
 	"github.com/smartcontractkit/chainlink/store/models"
@@ -30,15 +31,15 @@ func (ba *Bridge) Perform(input models.RunResult, store *store.Store) models.Run
 	} else if input.Status.PendingBridge() {
 		return resumeBridge(input)
 	}
-	return ba.handleNewRun(input, store.Config.BridgeResponseURL)
+	return ba.handleNewRun(input, store.Config.BridgeResponseURL())
 }
 
 func resumeBridge(input models.RunResult) models.RunResult {
 	input.Status = models.RunStatusInProgress
 	return input
 }
 
-func (ba *Bridge) handleNewRun(input models.RunResult, bridgeResponseURL models.WebURL) models.RunResult {
+func (ba *Bridge) handleNewRun(input models.RunResult, bridgeResponseURL *url.URL) models.RunResult {
 	var err error
 	if ba.Params != nil {
 		input.Data, err = input.Data.Merge(*ba.Params)
@@ -48,7 +49,7 @@ func (ba *Bridge) handleNewRun(input models.RunResult, bridgeResponseURL models.
 	}
 
 	responseURL := bridgeResponseURL
-	if (responseURL != models.WebURL{}) {
+	if *responseURL != *zeroURL {
 		responseURL.Path += fmt.Sprintf("/v2/runs/%s", input.JobRunID)
 	}
 	body, err := ba.postToExternalAdapter(input, responseURL)
@@ -74,7 +75,7 @@ func responseToRunResult(body []byte, input models.RunResult) models.RunResult {
 	return rr
 }
 
-func (ba *Bridge) postToExternalAdapter(input models.RunResult, bridgeResponseURL models.WebURL) ([]byte, error) {
+func (ba *Bridge) postToExternalAdapter(input models.RunResult, bridgeResponseURL *url.URL) ([]byte, error) {
 	in, err := json.Marshal(&bridgeOutgoing{
 		RunResult:   input,
 		ResponseURL: bridgeResponseURL,
@@ -112,7 +113,7 @@ func baRunResultError(in models.RunResult, str string, err error) models.RunResu
 
 type bridgeOutgoing struct {
 	models.RunResult
-	ResponseURL models.WebURL
+	ResponseURL *url.URL
 }
 
 func (bp bridgeOutgoing) MarshalJSON() ([]byte, error) {
@@ -127,3 +128,5 @@ func (bp bridgeOutgoing) MarshalJSON() ([]byte, error) {
 	}
 	return json.Marshal(anon)
 }
+
+var zeroURL = new(url.URL)
diff --git a/adapters/bridge_test.go b/adapters/bridge_test.go
@@ -15,7 +15,7 @@ import (
 func TestBridge_PerformEmbedsParamsInData(t *testing.T) {
 	store, cleanup := cltest.NewStore()
 	defer cleanup()
-	store.Config.BridgeResponseURL = cltest.WebURL("")
+	store.Config.Set("BridgeResponseURL", cltest.WebURL(""))
 
 	data := ""
 	token := ""
@@ -58,7 +58,7 @@ func TestBridge_Perform_transitionsTo(t *testing.T) {
 
 	store, cleanup := cltest.NewStore()
 	defer cleanup()
-	store.Config.BridgeResponseURL = cltest.WebURL("")
+	store.Config.Set("BridgeResponseURL", "")
 
 	for _, test := range cases {
 		t.Run(test.name, func(t *testing.T) {
@@ -103,7 +103,7 @@ func TestBridge_Perform_startANewRun(t *testing.T) {
 
 	store, cleanup := cltest.NewStore()
 	defer cleanup()
-	store.Config.BridgeResponseURL = cltest.WebURL("")
+	store.Config.Set("BridgeResponseURL", "")
 	runID := utils.NewBytes32ID()
 	wantedBody := fmt.Sprintf(`{"id":"%v","data":{"value":"lot 49"}}`, runID)
 
@@ -155,7 +155,7 @@ func TestBridge_Perform_responseURL(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			store, cleanup := cltest.NewStore()
 			defer cleanup()
-			store.Config.BridgeResponseURL = test.configuredURL
+			store.Config.Set("BridgeResponseURL", test.configuredURL)
 
 			mock, ensureCalled := cltest.NewHTTPMockServer(t, 200, "POST", ``,
 				func(_ http.Header, body string) {

diff --git a/adapters/eth_tx_test.go b/adapters/eth_tx_test.go
@@ -39,7 +39,7 @@ func TestEthTxAdapter_Perform_Confirmed(t *testing.T) {
 	hash := cltest.NewHash()
 	sentAt := uint64(23456)
 	confirmed := sentAt + 1
-	safe := confirmed + config.MinOutgoingConfirmations
+	safe := confirmed + config.MinOutgoingConfirmations()
 	ethMock.Register("eth_sendRawTransaction", hash,
 		func(_ interface{}, data ...interface{}) error {
 			rlp := data[0].([]interface{})[0].(string)
@@ -101,7 +101,7 @@ func TestEthTxAdapter_Perform_ConfirmedWithBytes(t *testing.T) {
 	hash := cltest.NewHash()
 	sentAt := uint64(23456)
 	confirmed := sentAt + 1
-	safe := confirmed + config.MinOutgoingConfirmations
+	safe := confirmed + config.MinOutgoingConfirmations()
 	ethMock.Register("eth_sendRawTransaction", hash,
 		func(_ interface{}, data ...interface{}) error {
 			rlp := data[0].([]interface{})[0].(string)
@@ -164,7 +164,7 @@ func TestEthTxAdapter_Perform_ConfirmedWithBytesAndNoDataPrefix(t *testing.T) {
 	hash := cltest.NewHash()
 	sentAt := uint64(23456)
 	confirmed := sentAt + 1
-	safe := confirmed + config.MinOutgoingConfirmations
+	safe := confirmed + config.MinOutgoingConfirmations()
 	ethMock.Register("eth_sendRawTransaction", hash,
 		func(_ interface{}, data ...interface{}) error {
 			rlp := data[0].([]interface{})[0].(string)
@@ -218,7 +218,7 @@ func TestEthTxAdapter_Perform_FromPendingConfirmations_StillPending(t *testing.T
 	ethMock := app.MockEthClient()
 	ethMock.Register("eth_getTransactionReceipt", strpkg.TxReceipt{})
 	sentAt := uint64(23456)
-	ethMock.Register("eth_blockNumber", utils.Uint64ToHex(sentAt+config.EthGasBumpThreshold-1))
+	ethMock.Register("eth_blockNumber", utils.Uint64ToHex(sentAt+config.EthGasBumpThreshold()-1))
 
 	require.NoError(t, app.StartAndConnect())
 
@@ -257,7 +257,7 @@ func TestEthTxAdapter_Perform_FromPendingConfirmations_BumpGas(t *testing.T) {
 	sentAt := uint64(23456)
 	ethMock.Context("ethtx perform", func(ethMock *cltest.EthMock) {
 		ethMock.Register("eth_getTransactionReceipt", strpkg.TxReceipt{})
-		ethMock.Register("eth_blockNumber", utils.Uint64ToHex(sentAt+config.EthGasBumpThreshold))
+		ethMock.Register("eth_blockNumber", utils.Uint64ToHex(sentAt+config.EthGasBumpThreshold()))
 		ethMock.Register("eth_sendRawTransaction", cltest.NewHash())
 	})
 
@@ -297,7 +297,7 @@ func TestEthTxAdapter_Perform_FromPendingConfirmations_ConfirmCompletes(t *testi
 		Hash:        cltest.NewHash(),
 		BlockNumber: cltest.Int(sentAt),
 	})
-	confirmedAt := sentAt + config.MinOutgoingConfirmations - 1 // confirmations are 0-based idx
+	confirmedAt := sentAt + config.MinOutgoingConfirmations() - 1 // confirmations are 0-based idx
 	ethMock.Register("eth_blockNumber", utils.Uint64ToHex(confirmedAt))
 
 	require.NoError(t, app.StartAndConnect())

diff --git a/cmd/app.go b/cmd/app.go
@@ -178,7 +178,7 @@ func NewApp(client *Client) *cli.App {
 		},
 	}
 
-	if client.Config.Dev {
+	if client.Config.Dev() {
 		createextrakey := cli.Command{
 			Name:   "createextrakey",
 			Usage:  "Create a key in the node's keystore alongside the existing key; to create an original key, just run the node",