diff --git a/cmd/lilypad/jobcreator.go b/cmd/lilypad/jobcreator.go index 4220b20e..44689e36 100644 --- a/cmd/lilypad/jobcreator.go +++ b/cmd/lilypad/jobcreator.go @@ -17,7 +17,6 @@ func newJobCreatorCmd() *cobra.Command { Long: "Start the lilypad job creator service.", Example: "", RunE: func(cmd *cobra.Command, args []string) error { - optionsfactory.CheckDeprecation(options.Offer.Services, options.Web3) network, _ := cmd.Flags().GetString("network") options, err := optionsfactory.ProcessOnChainJobCreatorOptions(options, args, network) diff --git a/cmd/lilypad/mediator.go b/cmd/lilypad/mediator.go index 5b6197d2..9790c386 100644 --- a/cmd/lilypad/mediator.go +++ b/cmd/lilypad/mediator.go @@ -19,7 +19,6 @@ func newMediatorCmd() *cobra.Command { Long: "Start the lilypad mediator service.", Example: "", RunE: func(cmd *cobra.Command, _ []string) error { - optionsfactory.CheckDeprecation(options.Services, options.Web3) network, _ := cmd.Flags().GetString("network") options, err := optionsfactory.ProcessMediatorOptions(options, network) diff --git a/cmd/lilypad/resource-provider.go b/cmd/lilypad/resource-provider.go index 03f12bb7..02cda777 100644 --- a/cmd/lilypad/resource-provider.go +++ b/cmd/lilypad/resource-provider.go @@ -18,7 +18,6 @@ func newResourceProviderCmd() *cobra.Command { Long: "Start the lilypad resource-provider service.", Example: "", RunE: func(cmd *cobra.Command, _ []string) error { - optionsfactory.CheckDeprecation(options.Offers.Services, options.Web3) network, _ := cmd.Flags().GetString("network") options, err := optionsfactory.ProcessResourceProviderOptions(options, network) diff --git a/cmd/lilypad/run.go b/cmd/lilypad/run.go index 37a34b97..c4e64446 100644 --- a/cmd/lilypad/run.go +++ b/cmd/lilypad/run.go @@ -27,7 +27,6 @@ func newRunCmd() *cobra.Command { Long: "Run a job on the Lilypad network.", Example: "run cowsay:v0.0.1 -i Message=moo", RunE: func(cmd *cobra.Command, args []string) error { - optionsfactory.CheckDeprecation(options.Offer.Services, options.Web3) network, _ := cmd.Flags().GetString("network") options, err := optionsfactory.ProcessJobCreatorOptions(options, args, network) diff --git a/cmd/lilypad/solver.go b/cmd/lilypad/solver.go index 1391965a..c18fe232 100644 --- a/cmd/lilypad/solver.go +++ b/cmd/lilypad/solver.go @@ -1,7 +1,6 @@ package lilypad import ( - "github.com/lilypad-tech/lilypad/pkg/data" optionsfactory "github.com/lilypad-tech/lilypad/pkg/options" "github.com/lilypad-tech/lilypad/pkg/solver" memorystore "github.com/lilypad-tech/lilypad/pkg/solver/store/memory" @@ -19,7 +18,6 @@ func newSolverCmd() *cobra.Command { Long: "Start the lilypad solver service.", Example: "", RunE: func(cmd *cobra.Command, _ []string) error { - optionsfactory.CheckDeprecation(data.ServiceConfig{}, options.Web3) network, _ := cmd.Flags().GetString("network") options, err := optionsfactory.ProcessSolverOptions(options, network) diff --git a/pkg/options/deprecation.go b/pkg/options/deprecation.go deleted file mode 100644 index 898fd552..00000000 --- a/pkg/options/deprecation.go +++ /dev/null @@ -1,26 +0,0 @@ -package options - -import ( - "fmt" - "log" - - "github.com/davecgh/go-spew/spew" - "github.com/lilypad-tech/lilypad/pkg/data" - "github.com/lilypad-tech/lilypad/pkg/web3" -) - -// TODO(bgins) Remove once users have migrated away from old testnet -func CheckDeprecation(serviceOptions data.ServiceConfig, web3Options web3.Web3Options) { - if web3Options.RpcURL == "ws://testnet.lilypad.tech:8546" { - web3Options.PrivateKey = "*****" - log.SetFlags(0) - log.Fatal(fmt.Sprintf(`This testnet has been deprecated. Please remove all environment variables for RPC URL, chain ID, and contract addresses. - -Your environment currently contains: - -%v -%v -The new testnet environment will be set by default, and you will only need to set your private key. -`, spew.Sdump(web3Options), spew.Sdump(serviceOptions))) - } -}