From c9613c1c5855a2c4f56a50eb64f0abde9b4a5fb3 Mon Sep 17 00:00:00 2001 From: Nico Vergauwen Date: Tue, 13 Apr 2021 00:09:06 +0200 Subject: [PATCH] fixup! fixup! cmd: remove deprecated storage flags --- cmd/livepeer/livepeer.go | 3 --- test_args.sh | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cmd/livepeer/livepeer.go b/cmd/livepeer/livepeer.go index c80024baaa..175a776cd5 100644 --- a/cmd/livepeer/livepeer.go +++ b/cmd/livepeer/livepeer.go @@ -712,9 +712,6 @@ func main() { } if *objectstore != "" { - if driversTesting := os.Getenv("OBJECT_STORE_TESTING"); driversTesting == "true" { - drivers.Testing = true - } prepared, err := drivers.PrepareOSURL(*objectstore) if err != nil { glog.Error("Error creating object store driver: ", err) diff --git a/test_args.sh b/test_args.sh index 9763d673af..3183045798 100755 --- a/test_args.sh +++ b/test_args.sh @@ -220,7 +220,7 @@ run_lp -broadcaster -verifierUrl http://host -verifierPath path kill $pid # Check OK with verifier + external storage -OBJECT_STORE_TESTING=true run_lp -broadcaster -verifierUrl http://host -objectStore memory://store1 +run_lp -broadcaster -verifierUrl http://host -objectStore s3+https://ACCESS_KEY_ID:ACCESS_KEY_PASSWORD@s3api.example.com/bucket-name kill $pid # Check that HTTP ingest is disabled when -httpAddr is publicly accessible and there is no auth webhook URL and -httpIngest defaults to false