CI: enforce fmt simplification

decred · Jul 6, 2022 · ef4120b · ef4120b
1 parent 1961b68
commit ef4120b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/client/asset/btc/btc_test.go b/client/asset/btc/btc_test.go
@@ -800,7 +800,7 @@ func testAvailableFund(t *testing.T, segwit bool, walletType string) {
 	blockHash, _ := node.addRawTx(blockHeight, msgTx)
 
 	node.getTransactionMap = map[string]*GetTransactionResult{
-		"any": &GetTransactionResult{
+		"any": {
 			BlockHash:  blockHash.String(),
 			BlockIndex: blockHeight,
 			Details: []*WalletTxDetails{
@@ -2388,7 +2388,7 @@ func testSender(t *testing.T, senderType tSenderType, segwit bool, walletType st
 
 	node.sendToAddress = txHash.String()
 	node.getTransactionMap = map[string]*GetTransactionResult{
-		"any": &GetTransactionResult{
+		"any": {
 			BlockHash:  blockHash.String(),
 			BlockIndex: blockHeight,
 			Hex:        txB,
@@ -2553,7 +2553,7 @@ func testConfirmations(t *testing.T, segwit bool, walletType string) {
 	txB, _ := serializeMsgTx(tx)
 
 	node.getTransactionMap = map[string]*GetTransactionResult{
-		"any": &GetTransactionResult{
+		"any": {
 			BlockHash: blockHash.String(),
 			Hex:       txB,
 		}}
@@ -3877,7 +3877,7 @@ func testGetTxFee(t *testing.T, segwit bool, walletType string) {
 	}
 
 	node.getTransactionMap = map[string]*GetTransactionResult{
-		"any": &GetTransactionResult{
+		"any": {
 			Hex: txBytes,
 		},
 	}

diff --git a/client/asset/btc/spv_test.go b/client/asset/btc/spv_test.go
@@ -457,7 +457,7 @@ func TestSwapConfirmations(t *testing.T) {
 	node.confsSpent = true
 	txB, _ := serializeMsgTx(swapTx)
 	node.getTransactionMap = map[string]*GetTransactionResult{
-		"any": &GetTransactionResult{
+		"any": {
 			BlockHash:  swapBlockHash.String(),
 			BlockIndex: swapHeight,
 			Hex:        txB,
@@ -593,7 +593,7 @@ func TestGetTxOut(t *testing.T) {
 
 	// Wallet transaction found
 	node.getTransactionErr = nil
-	node.getTransactionMap = map[string]*GetTransactionResult{"any": &GetTransactionResult{
+	node.getTransactionMap = map[string]*GetTransactionResult{"any": {
 		BlockHash: blockHash.String(),
 		Hex:       txB,
 	}}

diff --git a/dex/networks/erc20/contracts/updatecontract.sh b/dex/networks/erc20/contracts/updatecontract.sh
@@ -73,4 +73,7 @@ if [ "$VERSION" -eq "0" ]; then
 
   perl -0pi -e 's/\/\/ ERC20SwapSwap[^}]*}\n\n//' $CONTRACT_FILE
   perl -0pi -e 's/ERC20SwapSwap/ethv0.ETHSwapSwap/g' $CONTRACT_FILE
+
+  # Reorder the imports since we rewrote go-ethereum/event to a dcrdex package.
+  gofmt -s -w "$CONTRACT_FILE"
 fi
diff --git a/dex/networks/erc20/contracts/v0/contract.go b/dex/networks/erc20/contracts/v0/contract.go
diff --git a/dex/networks/eth/txdata_test.go b/dex/networks/eth/txdata_test.go
@@ -67,13 +67,13 @@ func TestParseInitiateDataV0(t *testing.T) {
 	locktime := int64(1632112916)
 
 	initiations := []*Initiation{
-		&Initiation{
+		{
 			LockTime:    time.Unix(locktime, 0),
 			SecretHash:  secretHashA,
 			Participant: participantAddr,
 			Value:       1,
 		},
-		&Initiation{
+		{
 			LockTime:    time.Unix(locktime, 0),
 			SecretHash:  secretHashB,
 			Participant: participantAddr,
@@ -164,11 +164,11 @@ func TestParseRedeemDataV0(t *testing.T) {
 	copy(secretB[:], mustParseHex("2c0a304c9321402dc11cbb5898b9f2af3029ce1c76ec6702c4cd5bb965fd3e73"))
 
 	redemptions := []*Redemption{
-		&Redemption{
+		{
 			Secret:     secretA,
 			SecretHash: secretHashA,
 		},
-		&Redemption{
+		{
 			Secret:     secretB,
 			SecretHash: secretHashB,
 		},