Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update references of prebid/openrtb to use mxmCherry/openrtb #115

Merged
merged 1 commit into from
Sep 7, 2017
Merged

Update references of prebid/openrtb to use mxmCherry/openrtb #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion adapters/appnexus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"golang.org/x/net/context/ctxhttp"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
)

type AppNexusAdapter struct {
Expand Down
2 changes: 1 addition & 1 deletion adapters/appnexus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"fmt"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
)

type anTagInfo struct {
Expand Down
2 changes: 1 addition & 1 deletion adapters/facebook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"net/http"
"strings"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
"github.com/prebid/prebid-server/pbs"
"golang.org/x/net/context/ctxhttp"
)
Expand Down
2 changes: 1 addition & 1 deletion adapters/facebook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"fmt"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
)

type tagInfo struct {
Expand Down
2 changes: 1 addition & 1 deletion adapters/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"golang.org/x/net/context/ctxhttp"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
)

type IndexAdapter struct {
Expand Down
2 changes: 1 addition & 1 deletion adapters/index_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"fmt"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
)

func TestIndexInvalidCall(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions adapters/openrtb_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package adapters
import (
"github.com/prebid/prebid-server/pbs"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
)

func makeOpenRTBGeneric(req *pbs.PBSRequest, bidder *pbs.PBSBidder, bidderFamily string) openrtb.BidRequest {
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion adapters/openrtb_util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
)

func TestOpenRTB(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion adapters/pubmatic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"net/http"
"net/url"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
"github.com/prebid/prebid-server/pbs"
"golang.org/x/net/context/ctxhttp"
)
Expand Down
2 changes: 1 addition & 1 deletion adapters/pubmatic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"fmt"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
)

func TestPubmaticInvalidCall(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion adapters/pulsepoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"strconv"
"strings"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
"github.com/prebid/prebid-server/pbs"
"golang.org/x/net/context/ctxhttp"
)
Expand Down
2 changes: 1 addition & 1 deletion adapters/pulsepoint_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"testing"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
"github.com/prebid/prebid-server/cache/dummycache"
"github.com/prebid/prebid-server/pbs"
)
Expand Down
2 changes: 1 addition & 1 deletion adapters/rubicon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (

"golang.org/x/net/context/ctxhttp"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
)

type RubiconAdapter struct {
Expand Down
2 changes: 1 addition & 1 deletion adapters/rubicon_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"fmt"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
)

type rubiAppendTrackerUrlTestScenario struct {
Expand Down
4 changes: 2 additions & 2 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import:
- proto
- package: github.com/julienschmidt/httprouter
version: ~1.1.0
- package: github.com/prebid/openrtb
version: ~3.0.3
- package: github.com/mxmCherry/openrtb
version: ~6.0.0
- package: github.com/rcrowley/go-metrics
- package: github.com/spf13/viper
- package: github.com/vrischmann/go-metrics-influxdb
Expand Down
6 changes: 3 additions & 3 deletions pbs/pbsrequest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"github.com/spf13/viper"
"golang.org/x/net/publicsuffix"

"github.com/prebid/openrtb"
"github.com/mxmCherry/openrtb"
"github.com/prebid/prebid-server/cache"
"github.com/prebid/prebid-server/prebid"
)
Expand Down Expand Up @@ -82,7 +82,7 @@ type PBSRequest struct {
SortBids int8 `json:"sort_bids"`
MaxKeyLength int8 `json:"max_key_length"`
Secure int8 `json:"secure"`
TimeoutMillis uint64 `json:"timeout_millis"`
TimeoutMillis int64 `json:"timeout_millis"`
AdUnits []AdUnit `json:"ad_units"`
IsDebug bool `json:"is_debug"`
App *openrtb.App `json:"app"`
Expand Down Expand Up @@ -129,7 +129,7 @@ func ParsePBSRequest(r *http.Request, cache cache.Cache) (*PBSRequest, error) {
}

if pbsReq.TimeoutMillis == 0 || pbsReq.TimeoutMillis > 2000 {
pbsReq.TimeoutMillis = uint64(viper.GetInt("default_timeout_ms"))
pbsReq.TimeoutMillis = int64(viper.GetInt("default_timeout_ms"))
}

if pbsReq.Device == nil {
Expand Down