Merge pull request #178 from 0xProject/marcin/naming

fix: inaccurate function behavior and dup tests

.github/workflows/golang.yaml

@@ -29,16 +29,11 @@ jobs:
             ~/go/pkg/mod
             ~/.cache/go-build
           key: cache-${{ hashFiles('**/go.sum') }}
-      - name: Start testing dependencies
-        run: docker-compose up -d
       - name: Run tests
         run: go test -race -shuffle=on -v ./internal/...
         env:
           RPC_GATEWAY_NODE_URL_1: ${{ secrets.RPC_GATEWAY_NODE_URL_1 }}
           RPC_GATEWAY_NODE_URL_2: ${{ secrets.RPC_GATEWAY_NODE_URL_2 }}
-      - name: Print out docker containers' logs
-        if: always()
-        run: docker-compose logs
 
   vulncheck:
     runs-on: ubuntu-latest

README.md

@@ -27,11 +27,6 @@ RPC Gateway-->>Alice: {"result":[...]}
 
 ## Development
 
-Start dependent services
-```console
-docker-compose up
-```
-
 Make sure the test pass
 ```console
 go test -v ./...

example_config.yml

@@ -1,3 +1,5 @@
+---
+
 metrics:
   port: 9090 # port for prometheus metrics, served on /metrics and /
 

internal/rpcgateway/rpcgateway.go

@@ -125,25 +125,19 @@ func NewRPCGateway(config RPCGatewayConfig) (*RPCGateway, error) {
 	}, nil
 }
 
-func NewRPCGatewayFromConfigFile(path string) (*RPCGatewayConfig, error) {
-	data, err := os.ReadFile(path)
+// NewRPCGatewayFromConfigFile creates an instance of RPCGateway from provided
+// configuration file.
+func NewRPCGatewayFromConfigFile(s string) (*RPCGateway, error) {
+	data, err := os.ReadFile(s)
 	if err != nil {
 		return nil, err
 	}
 
-	return NewRPCGatewayFromConfigBytes(data)
-}
-
-func NewRPCGatewayFromConfigBytes(configBytes []byte) (*RPCGatewayConfig, error) {
-	config := RPCGatewayConfig{}
+	var config RPCGatewayConfig
 
-	if err := yaml.Unmarshal(configBytes, &config); err != nil {
+	if err := yaml.Unmarshal(data, &config); err != nil {
 		return nil, err
 	}
 
-	return &config, nil
-}
-
-func NewRPCGatewayFromConfigString(configString string) (*RPCGatewayConfig, error) {
-	return NewRPCGatewayFromConfigBytes([]byte(configString))
+	return NewRPCGateway(config)
 }

main.go

@@ -28,12 +28,7 @@ func main() {
 			},
 		},
 		Action: func(cc *cli.Context) error {
-			config, err := rpcgateway.NewRPCGatewayFromConfigFile(cc.String("config"))
-			if err != nil {
-				return err
-			}
-
-			service, err := rpcgateway.NewRPCGateway(*config)
+			service, err := rpcgateway.NewRPCGatewayFromConfigFile(cc.String("config"))
 			if err != nil {
 				return errors.Wrap(err, "rpc-gateway failed")
 			}