Revert "updating various files to use mxmCherry/openrtb repo instead …

…of prebid/openrtb forked repo, as well as some var type changes (#115)" This reverts commit cb7c641.
prebid · Sep 8, 2017 · 2c83456 · 2c83456
1 parent cb7c641
commit 2c83456
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 22 deletions.
diff --git a/adapters/appnexus.go b/adapters/appnexus.go
@@ -15,7 +15,7 @@ import (
 
 	"golang.org/x/net/context/ctxhttp"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 )
 
 type AppNexusAdapter struct {

diff --git a/adapters/appnexus_test.go b/adapters/appnexus_test.go
@@ -15,7 +15,7 @@ import (
 
 	"fmt"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 )
 
 type anTagInfo struct {

diff --git a/adapters/facebook.go b/adapters/facebook.go
@@ -11,7 +11,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 	"github.com/prebid/prebid-server/pbs"
 	"golang.org/x/net/context/ctxhttp"
 )

diff --git a/adapters/facebook_test.go b/adapters/facebook_test.go
@@ -15,7 +15,7 @@ import (
 
 	"fmt"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 )
 
 type tagInfo struct {

diff --git a/adapters/index.go b/adapters/index.go
@@ -14,7 +14,7 @@ import (
 
 	"golang.org/x/net/context/ctxhttp"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 )
 
 type IndexAdapter struct {

diff --git a/adapters/index_test.go b/adapters/index_test.go
@@ -12,7 +12,7 @@ import (
 
 	"fmt"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 )
 
 func TestIndexInvalidCall(t *testing.T) {

diff --git a/adapters/openrtb_util.go b/adapters/openrtb_util.go
@@ -3,7 +3,7 @@ package adapters
 import (
 	"github.com/prebid/prebid-server/pbs"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 )
 
 func makeOpenRTBGeneric(req *pbs.PBSRequest, bidder *pbs.PBSBidder, bidderFamily string) openrtb.BidRequest {
@@ -22,7 +22,7 @@ func makeOpenRTBGeneric(req *pbs.PBSRequest, bidder *pbs.PBSBidder, bidderFamily
 				Format:   unit.Sizes,
 				TopFrame: unit.TopFrame,
 			},
-			Secure: &req.Secure,
+			Secure: req.Secure,
 			// pmp
 			// ext
 		}

diff --git a/adapters/openrtb_util_test.go b/adapters/openrtb_util_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 )
 
 func TestOpenRTB(t *testing.T) {

diff --git a/adapters/pubmatic.go b/adapters/pubmatic.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 	"github.com/prebid/prebid-server/pbs"
 	"golang.org/x/net/context/ctxhttp"
 )

diff --git a/adapters/pubmatic_test.go b/adapters/pubmatic_test.go
@@ -12,7 +12,7 @@ import (
 
 	"fmt"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 )
 
 func TestPubmaticInvalidCall(t *testing.T) {

diff --git a/adapters/pulsepoint.go b/adapters/pulsepoint.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 	"github.com/prebid/prebid-server/pbs"
 	"golang.org/x/net/context/ctxhttp"
 )

diff --git a/adapters/pulsepoint_test.go b/adapters/pulsepoint_test.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 	"github.com/prebid/prebid-server/cache/dummycache"
 	"github.com/prebid/prebid-server/pbs"
 )

diff --git a/adapters/rubicon.go b/adapters/rubicon.go
@@ -14,7 +14,7 @@ import (
 
 	"golang.org/x/net/context/ctxhttp"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 )
 
 type RubiconAdapter struct {

diff --git a/adapters/rubicon_test.go b/adapters/rubicon_test.go
@@ -15,7 +15,7 @@ import (
 
 	"fmt"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 )
 
 type rubiAppendTrackerUrlTestScenario struct {

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -6,8 +6,8 @@ import:
   - proto
 - package: github.com/julienschmidt/httprouter
   version: ~1.1.0
-- package: github.com/mxmCherry/openrtb
-  version: ~6.0.0
+- package: github.com/prebid/openrtb
+  version: ~3.0.3
 - package: github.com/rcrowley/go-metrics
 - package: github.com/spf13/viper
 - package: github.com/vrischmann/go-metrics-influxdb

diff --git a/pbs/pbsrequest.go b/pbs/pbsrequest.go
@@ -13,7 +13,7 @@ import (
 	"github.com/spf13/viper"
 	"golang.org/x/net/publicsuffix"
 
-	"github.com/mxmCherry/openrtb"
+	"github.com/prebid/openrtb"
 	"github.com/prebid/prebid-server/cache"
 	"github.com/prebid/prebid-server/prebid"
 )
@@ -82,7 +82,7 @@ type PBSRequest struct {
 	SortBids      int8            `json:"sort_bids"`
 	MaxKeyLength  int8            `json:"max_key_length"`
 	Secure        int8            `json:"secure"`
-	TimeoutMillis int64           `json:"timeout_millis"`
+	TimeoutMillis uint64          `json:"timeout_millis"`
 	AdUnits       []AdUnit        `json:"ad_units"`
 	IsDebug       bool            `json:"is_debug"`
 	App           *openrtb.App    `json:"app"`
@@ -129,7 +129,7 @@ func ParsePBSRequest(r *http.Request, cache cache.Cache) (*PBSRequest, error) {
 	}
 
 	if pbsReq.TimeoutMillis == 0 || pbsReq.TimeoutMillis > 2000 {
-		pbsReq.TimeoutMillis = int64(viper.GetInt("default_timeout_ms"))
+		pbsReq.TimeoutMillis = uint64(viper.GetInt("default_timeout_ms"))
 	}
 
 	if pbsReq.Device == nil {
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ import ( @@
     	"fmt"
-    	"github.com/mxmCherry/openrtb"
+    	"github.com/prebid/openrtb"
     )
     type anTagInfo struct {
@@ Expand Down @@