From afccf5d89a48217be33324ab384d92acad9438ef Mon Sep 17 00:00:00 2001 From: dbemiller Date: Fri, 8 Sep 2017 09:55:10 -0400 Subject: [PATCH] Revert "updating various files to use mxmCherry/openrtb repo instead of prebid/openrtb forked repo, as well as some var type changes (#115)" (#121) This reverts commit cb7c6417367f573239accb9bb5b010ab0c26853f. --- adapters/appnexus.go | 2 +- adapters/appnexus_test.go | 2 +- adapters/facebook.go | 2 +- adapters/facebook_test.go | 2 +- adapters/index.go | 2 +- adapters/index_test.go | 2 +- adapters/openrtb_util.go | 4 ++-- adapters/openrtb_util_test.go | 2 +- adapters/pubmatic.go | 2 +- adapters/pubmatic_test.go | 2 +- adapters/pulsepoint.go | 2 +- adapters/pulsepoint_test.go | 2 +- adapters/rubicon.go | 2 +- adapters/rubicon_test.go | 2 +- glide.lock | 4 ++-- glide.yaml | 4 ++-- pbs/pbsrequest.go | 6 +++--- 17 files changed, 22 insertions(+), 22 deletions(-) diff --git a/adapters/appnexus.go b/adapters/appnexus.go index 0862cae1ae0..a4f29cbec40 100644 --- 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 index 47cd16d116e..e9a1425a22c 100644 --- 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 index 131e6fc76b4..1817103c665 100644 --- 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 index e11529e9a57..e9c86b5136f 100644 --- 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 index 2d8e74b43de..669d4ab0201 100644 --- 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 index 989de4ed6b7..598f818665a 100644 --- 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 index 07b49caf6ac..0950d982746 100644 --- 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 index caccffbf20d..e4460721758 100644 --- 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 index 9296c9e50ba..db2c742ffef 100644 --- 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 index 738cc9e7c30..cc521db28c8 100644 --- 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 index b604236a53a..1f6d6037745 100644 --- 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 index 00dabd6ee7e..7eea51ae0ac 100644 --- 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 index 870ce6a8ed7..6987ad7a6f6 100644 --- 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 index b48b4ca2f7a..0a5497c8e42 100644 --- 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 index 0edcac1f83f..1621c6e9340 100644 --- a/glide.lock +++ b/glide.lock @@ -46,8 +46,8 @@ imports: version: c37440a7cf42ac63b919c752ca73a85067e05992 - name: github.com/pelletier/go-toml version: 685a1f1cb7a66b9cadbe8f1ac49d9f8f567d6a9d -- name: github.com/mxmCherry/openrtb - version: af5bbec3623c8140b3f381af8ddcb1fce268d7d2 +- name: github.com/prebid/openrtb + version: 4abcf757715a1a5e13211dd6c67c8e21c73b4668 - name: github.com/rcrowley/go-metrics version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c - name: github.com/rs/cors diff --git a/glide.yaml b/glide.yaml index 98dcccff615..cba468cb879 100644 --- 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 index c73c09fa6ca..b4c07938790 100644 --- 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 {