Cleanup after cortina merge, reduce diff with avax (#371)

chain4travel · Aug 7, 2024 · 05022a8 · 05022a8
1 parent 3b0d67a
commit 05022a8
Show file tree

Hide file tree

Showing 20 changed files with 71 additions and 77 deletions.
diff --git a/api/server/server.go b/api/server/server.go
@@ -1,13 +1,3 @@
-// Copyright (C) 2023, Chain4Travel AG. All rights reserved.
-//
-// This file is a derived work, based on ava-labs code whose
-// original notices appear below.
-//
-// It is distributed under the same license conditions as the
-// original code from which it is derived.
-//
-// Much love to the original authors for their work.
-// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
@@ -137,21 +127,10 @@ func New(
 	}
 
 	router := newRouter()
-	corsOptions := cors.Options{
+	corsHandler := cors.New(cors.Options{
+		AllowedOrigins:   allowedOrigins,
 		AllowCredentials: true,
-	}
-
-	// If and only if allowed origin only contains the wildcard, copy the hostname to the allow
-	// origins header
-	if len(allowedOrigins) == 1 && allowedOrigins[0] == "*" {
-		corsOptions.AllowOriginFunc = func(origin string) bool {
-			return true
-		}
-	} else {
-		corsOptions.AllowedOrigins = allowedOrigins
-	}
-
-	corsHandler := cors.New(corsOptions).Handler(router)
+	}).Handler(router)
 	gzipHandler := gziphandler.GzipHandler(corsHandler)
 	var handler http.Handler = http.HandlerFunc(
 		func(w http.ResponseWriter, r *http.Request) {

diff --git a/codec/reflectcodec/struct_fielder.go b/codec/reflectcodec/struct_fielder.go
@@ -1,3 +1,13 @@
+// Copyright (C) 2023-2024, Chain4Travel AG. All rights reserved.
+//
+// This file is a derived work, based on ava-labs code whose
+// original notices appear below.
+//
+// It is distributed under the same license conditions as the
+// original code from which it is derived.
+//
+// Much love to the original authors for their work.
+// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 

diff --git a/config/keys.go b/config/keys.go
@@ -1,3 +1,13 @@
+// Copyright (C) 2023, Chain4Travel AG. All rights reserved.
+//
+// This file is a derived work, based on ava-labs code whose
+// original notices appear below.
+//
+// It is distributed under the same license conditions as the
+// original code from which it is derived.
+//
+// Much love to the original authors for their work.
+// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 

diff --git a/main/main.go b/main/main.go
@@ -1,13 +1,3 @@
-// Copyright (C) 2022-2023, Chain4Travel AG. All rights reserved.
-//
-// This file is a derived work, based on ava-labs code whose
-// original notices appear below.
-//
-// It is distributed under the same license conditions as the
-// original code from which it is derived.
-//
-// Much love to the original authors for their work.
-// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
@@ -19,6 +9,7 @@ import (
 	"os"
 
 	"github.com/spf13/pflag"
+
 	"golang.org/x/term"
 
 	"github.com/ava-labs/avalanchego/app"

diff --git a/node/config.go b/node/config.go
@@ -1,3 +1,13 @@
+// Copyright (C) 2023-2024, Chain4Travel AG. All rights reserved.
+//
+// This file is a derived work, based on ava-labs code whose
+// original notices appear below.
+//
+// It is distributed under the same license conditions as the
+// original code from which it is derived.
+//
+// Much love to the original authors for their work.
+// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 

diff --git a/tests/e2e/banff/suites.go b/tests/e2e/banff/suites.go
@@ -1,13 +1,3 @@
-// Copyright (C) 2022-2023, Chain4Travel AG. All rights reserved.
-//
-// This file is a derived work, based on ava-labs code whose
-// original notices appear below.
-//
-// It is distributed under the same license conditions as the
-// original code from which it is derived.
-//
-// Much love to the original authors for their work.
-// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 

diff --git a/tests/e2e/e2e.go b/tests/e2e/e2e.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023, Chain4Travel AG. All rights reserved.
+// Copyright (C) 2022-2024, Chain4Travel AG. All rights reserved.
 //
 // This file is a derived work, based on ava-labs code whose
 // original notices appear below.

diff --git a/tests/e2e/e2e_test.go b/tests/e2e/e2e_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023, Chain4Travel AG. All rights reserved.
+// Copyright (C) 2022-2024, Chain4Travel AG. All rights reserved.
 //
 // This file is a derived work, based on ava-labs code whose
 // original notices appear below.

diff --git a/tests/e2e/p/permissionless_subnets.go b/tests/e2e/p/permissionless_subnets.go
@@ -1,13 +1,3 @@
-// Copyright (C) 2022-2023, Chain4Travel AG. All rights reserved.
-//
-// This file is a derived work, based on ava-labs code whose
-// original notices appear below.
-//
-// It is distributed under the same license conditions as the
-// original code from which it is derived.
-//
-// Much love to the original authors for their work.
-// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 

diff --git a/tests/e2e/p/workflow.go b/tests/e2e/p/workflow.go
@@ -1,13 +1,3 @@
-// Copyright (C) 2022-2023, Chain4Travel AG. All rights reserved.
-//
-// This file is a derived work, based on ava-labs code whose
-// original notices appear below.
-//
-// It is distributed under the same license conditions as the
-// original code from which it is derived.
-//
-// Much love to the original authors for their work.
-// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 

diff --git a/tests/upgrade/upgrade_test.go b/tests/upgrade/upgrade_test.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023, Chain4Travel AG. All rights reserved.
+// Copyright (C) 2022-2024, Chain4Travel AG. All rights reserved.
 //
 // This file is a derived work, based on ava-labs code whose
 // original notices appear below.

diff --git a/version/compatibility_test.go b/version/compatibility_test.go
@@ -1,3 +1,13 @@
+// Copyright (C) 2024, Chain4Travel AG. All rights reserved.
+//
+// This file is a derived work, based on ava-labs code whose
+// original notices appear below.
+//
+// It is distributed under the same license conditions as the
+// original code from which it is derived.
+//
+// Much love to the original authors for their work.
+// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 

diff --git a/version/constants_test.go b/version/constants_test.go
@@ -11,8 +11,8 @@ import (
 
 func TestCurrentRPCChainVMCompatible(t *testing.T) {
 	compatibleVersions := RPCChainVMProtocolCompatibility[RPCChainVMProtocol]
-	for _, version := range compatibleVersions {
-		_ = version.String()
+	for _, ver := range compatibleVersions {
+		_ = ver.String()
 	}
 	require.Contains(t, compatibleVersions, Current)
 }
diff --git a/vms/platformvm/addrstate/address_state.go → ...tformvm/addrstate/camino_address_state.go b/vms/platformvm/addrstate/address_state.go → ...tformvm/addrstate/camino_address_state.go
diff --git a/vms/platformvm/api/static_service.go b/vms/platformvm/api/static_service.go
@@ -210,7 +210,6 @@ func bech32ToID(addrStr string) (ids.ShortID, error) {
 // BuildGenesis build the genesis state of the Platform Chain (and thereby the Avalanche network.)
 func (*StaticService) BuildGenesis(_ *http.Request, args *BuildGenesisArgs, reply *BuildGenesisReply) error {
 	// Specify the UTXOs on the Platform chain that exist at genesis.
-	var vdrs txheap.TimedHeap
 	if args.Camino != nil && args.Camino.LockModeBondDeposit {
 		return buildCaminoGenesis(args, reply)
 	}
@@ -257,7 +256,7 @@ func (*StaticService) BuildGenesis(_ *http.Request, args *BuildGenesisArgs, repl
 	}
 
 	// Specify the validators that are validating the primary network at genesis.
-	vdrs = txheap.NewByEndTime()
+	vdrs := txheap.NewByEndTime()
 	for _, vdr := range args.Validators {
 		weight := uint64(0)
 		stake := make([]*avax.TransferableOutput, len(vdr.Staked))

diff --git a/vms/platformvm/service_test.go b/vms/platformvm/service_test.go
@@ -11,8 +11,6 @@
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 
-//go:generate mockgen -source cache_internal_state.go -destination mock_cache_internal_state.go -package platformvm -aux_files github.com/chain4travel/caminogo/vms/platformvm=cache_versioned_state.go,github.com/chain4travel/caminogo/vms/platformvm=cache_validator_state.go
-
 package platformvm
 
 import (

diff --git a/vms/platformvm/txs/base_tx_test.go b/vms/platformvm/txs/base_tx_test.go
@@ -1,3 +1,13 @@
+// Copyright (C) 2024, Chain4Travel AG. All rights reserved.
+//
+// This file is a derived work, based on ava-labs code whose
+// original notices appear below.
+//
+// It is distributed under the same license conditions as the
+// original code from which it is derived.
+//
+// Much love to the original authors for their work.
+// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.
 

diff --git a/vms/platformvm/txs/executor/proposal_tx_executor.go b/vms/platformvm/txs/executor/proposal_tx_executor.go
@@ -1,4 +1,4 @@
-// Copyright (C) 2022-2023, Chain4Travel AG. All rights reserved.
+// Copyright (C) 2022-2024, Chain4Travel AG. All rights reserved.
 //
 // This file is a derived work, based on ava-labs code whose
 // original notices appear below.

diff --git a/vms/platformvm/txs/executor/state_changes.go b/vms/platformvm/txs/executor/state_changes.go
@@ -148,9 +148,6 @@ func AdvanceTimeTo(
 		if stakerToRemove.StartTime.After(newChainTime) {
 			break
 		}
-		if stakerToRemove.EndTime.Equal(stakerToRemove.StartTime) {
-			continue
-		}
 
 		stakerToAdd := *stakerToRemove
 		stakerToAdd.NextTime = stakerToRemove.EndTime

diff --git a/vms/types/blob_data.go b/vms/types/blob_data.go
@@ -1,3 +1,13 @@
+// Copyright (C) 2022-2024, Chain4Travel AG. All rights reserved.
+//
+// This file is a derived work, based on ava-labs code whose
+// original notices appear below.
+//
+// It is distributed under the same license conditions as the
+// original code from which it is derived.
+//
+// Much love to the original authors for their work.
+// **********************************************************
 // Copyright (C) 2019-2023, Ava Labs, Inc. All rights reserved.
 // See the file LICENSE for licensing terms.